Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install CSI drivers for k8s 1.23 un-conditionally #1831

Merged
merged 4 commits into from
Feb 11, 2022
Merged

Install CSI drivers for k8s 1.23 un-conditionally #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d58d6d
Install available CSI driver for k8s 1.23 un-conditionally
ahmedwaleedmalik Feb 10, 2022
3d831a2
Refactored code
ahmedwaleedmalik Feb 10, 2022
66ba2bc
Merge branch 'master' of https://github.com/kubermatic/kubeone into i…
ahmedwaleedmalik Feb 11, 2022
d6c2d23
Install CSI driver for nutanix unconditionally
ahmedwaleedmalik Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
244 changes: 134 additions & 110 deletions pkg/addons/ensure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ var (
resources.AddonCSIAzureFile: "",
resources.AddonCSIDigitalOcean: "",
resources.AddonCSIHetzner: "",
resources.AddonCSINutanix: "",
resources.AddonCSIOpenStackCinder: "",
resources.AddonCSIVsphere: "",
resources.AddonMachineController: "",
Expand Down Expand Up @@ -113,117 +114,10 @@ func collectAddons(s *state.State) (addonsToDeploy []addonAction) {
})
}

k8sVersion := semver.MustParse(s.Cluster.Versions.Kubernetes)

// Special case for AWS
if s.Cluster.CloudProvider.AWS != nil {
if s.Cluster.CloudProvider.External {
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMAws,
},
addonAction{
name: resources.AddonCSIAwsEBS,
},
)
} else if greaterThan23.Check(k8sVersion) {
// since k8s 1.23 CSIMigrationAWS is turned on by default and requires installation of AWS EBS CSI driver even if
// we don't use external ccm (https://github.com/kubernetes/kubernetes/pull/106098)

addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIAwsEBS,
},
)
}
}

// Special case for AZURE
if s.Cluster.CloudProvider.Azure != nil {
if s.Cluster.CloudProvider.External {
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMAzure,
},
addonAction{
name: resources.AddonCSIAzureDisk,
},
addonAction{
name: resources.AddonCSIAzureFile,
},
)
} else if greaterThan23.Check(k8sVersion) {
// since k8s 1.23 CSIMigrationAzureDisk is turned on by default and requires installation of AzureDisk CSI driver
// even if we don't use external ccm
// note: in 1.23 CSIMigrationAzureFile is still turn off by default

addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIAzureDisk,
},
addonAction{
name: resources.AddonCSIAzureFile,
},
)
}
}
addonsToDeploy = ensureCSIAddons(s, addonsToDeploy)

if !s.Cluster.CloudProvider.External {
return
}

switch {
case s.Cluster.CloudProvider.DigitalOcean != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMDigitalOcean,
},
addonAction{
name: resources.AddonCSIDigitalOcean,
},
)
case s.Cluster.CloudProvider.Hetzner != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMHetzner,
},
addonAction{
name: resources.AddonCSIHetzner,
},
)
case s.Cluster.CloudProvider.Openstack != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMOpenStack,
},
addonAction{
name: resources.AddonCSIOpenStackCinder,
},
)

case s.Cluster.CloudProvider.Vsphere != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMVsphere,
supportFn: func() error {
return migrateVsphereAddon(s)
},
},
addonAction{
name: resources.AddonCSIVsphere,
},
)
case s.Cluster.CloudProvider.EquinixMetal != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMEquinixMetal,
supportFn: func() error {
return migratePacketToEquinixCCM(s)
},
},
)
default:
s.Logger.Infof("CSI driver for %q not yet supported, skipping", s.Cluster.CloudProvider.CloudProviderName())
if s.Cluster.CloudProvider.External {
addonsToDeploy = ensureCCMAddons(s, addonsToDeploy)
}

return
Expand Down Expand Up @@ -413,3 +307,133 @@ func DeleteAddonByName(s *state.State, addonName string) error {

return errors.Errorf("addon %q does not exist", addonName)
}

func ensureCSIAddons(s *state.State, addonsToDeploy []addonAction) []addonAction {
k8sVersion := semver.MustParse(s.Cluster.Versions.Kubernetes)
gte23 := greaterThan23.Check(k8sVersion)

// We deploy available CSI drivers un-conditionally for k8s v1.23+
//
// CSIMigration, if applicable, for the cloud providers is turned on by default and requires installation of CSI drviers even if we
// don't use external CCM. Although mount operations would fall-back to in-tree solution if CSI driver is not available. Fallback
// for provision operations is NOT supported by in-tree solution.

switch {
// CSI driver is required for k8s v.1.23+
case s.Cluster.CloudProvider.AWS != nil && (gte23 || s.Cluster.CloudProvider.External):
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIAwsEBS,
},
)
// CSI driver is required for k8s v.1.23+
case s.Cluster.CloudProvider.Azure != nil && (gte23 || s.Cluster.CloudProvider.External):
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIAzureDisk,
},
addonAction{
name: resources.AddonCSIAzureFile,
},
)

// Install CSI driver unconditionally
case s.Cluster.CloudProvider.DigitalOcean != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIDigitalOcean,
},
)
// Install CSI driver unconditionally
case s.Cluster.CloudProvider.Hetzner != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIHetzner,
},
)
// Install CSI driver unconditionally
case s.Cluster.CloudProvider.Nutanix != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSINutanix,
},
)
// Install CSI driver unconditionally
case s.Cluster.CloudProvider.Openstack != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIOpenStackCinder,
},
)

// Install CSI driver only if external cloud provider is used
case s.Cluster.CloudProvider.Vsphere != nil && s.Cluster.CloudProvider.External:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCSIVsphere,
},
)
default:
s.Logger.Infof("CSI driver for %q not yet supported, skipping", s.Cluster.CloudProvider.CloudProviderName())
}

return addonsToDeploy
}

func ensureCCMAddons(s *state.State, addonsToDeploy []addonAction) []addonAction {
switch {
case s.Cluster.CloudProvider.AWS != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMAws,
},
)
case s.Cluster.CloudProvider.Azure != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMAzure,
},
)
case s.Cluster.CloudProvider.DigitalOcean != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMDigitalOcean,
},
)
case s.Cluster.CloudProvider.Hetzner != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMHetzner,
},
)
case s.Cluster.CloudProvider.Openstack != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMOpenStack,
},
)

case s.Cluster.CloudProvider.Vsphere != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMVsphere,
supportFn: func() error {
return migrateVsphereAddon(s)
},
},
)
case s.Cluster.CloudProvider.EquinixMetal != nil:
addonsToDeploy = append(addonsToDeploy,
addonAction{
name: resources.AddonCCMEquinixMetal,
supportFn: func() error {
return migratePacketToEquinixCCM(s)
},
},
)
default:
s.Logger.Infof("CCM driver for %q not yet supported, skipping", s.Cluster.CloudProvider.CloudProviderName())
}

return addonsToDeploy
}
1 change: 1 addition & 0 deletions pkg/templates/resources/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const (
AddonCSIAzureFile = "csi-azurefile"
AddonCSIDigitalOcean = "csi-digitalocean"
AddonCSIHetzner = "csi-hetzner"
AddonCSINutanix = "csi-nutanix"
AddonCSIOpenStackCinder = "csi-openstack-cinder"
AddonCSIVsphere = "csi-vsphere"
AddonCNICanal = "cni-canal"
Expand Down