kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make AWS EBS CSI Driver default as of k8s 1.22

This commit is contained in:
Ole Markus With 2021-06-08 22:29:16 +02:00
parent 424ed25f25
commit 6582235312
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/components/awsebscsidriver.go
View File

@ -38,7 +38,7 @@ func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error {
cc := clusterSpec.CloudConfig cc := clusterSpec.CloudConfig
if cc.AWSEBSCSIDriver == nil { if cc.AWSEBSCSIDriver == nil {
cc.AWSEBSCSIDriver = &kops.AWSEBSCSIDriver{ cc.AWSEBSCSIDriver = &kops.AWSEBSCSIDriver{
Enabled: fi.Bool(false), Enabled: fi.Bool(b.IsKubernetesGTE("1.22")),
} }
} }
c := cc.AWSEBSCSIDriver c := cc.AWSEBSCSIDriver

3
tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml
View File

@ -9,9 +9,6 @@ spec:
authorization: authorization:
rbac: {} rbac: {}
channel: stable channel: stable
cloudConfig:
awsEBSCSIDriver:
enabled: true
cloudProvider: aws cloudProvider: aws
configBase: memfs://tests/minimal.example.com configBase: memfs://tests/minimal.example.com
etcdClusters: etcdClusters:

12
upup/pkg/fi/cloudup/new_cluster.go
View File

@ -249,18 +249,6 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
} }
} }
if api.CloudProviderID(cluster.Spec.CloudProvider) == api.CloudProviderAWS && cluster.IsKubernetesGTE("1.22") {
if cluster.Spec.CloudConfig == nil {
cluster.Spec.CloudConfig = &api.CloudConfiguration{}
}
if cluster.Spec.CloudConfig.AWSEBSCSIDriver == nil {
cluster.Spec.CloudConfig.AWSEBSCSIDriver = &api.AWSEBSCSIDriver{}
}
if cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled == nil {
cluster.Spec.CloudConfig.AWSEBSCSIDriver.Enabled = fi.Bool(true)
}
}
err = setupVPC(opt, &cluster) err = setupVPC(opt, &cluster)
if err != nil { if err != nil {
return nil, err return nil, err