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

Jump to bottom

Enable AWS EBS CSI driver by default #11605

Merged
merged 1 commit into from
May 27, 2021
Merged

Enable AWS EBS CSI driver by default #11605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions docs/releases/1.22-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ This is a document to gather the release notes prior to the release.

# Significant changes

* New clusters running Kubernetes 1.22 will have AWS EBS CSI driver enabled by default.

# Breaking changes

* Support for Kubernetes versions 1.15 and 1.16 has been removed.
Expand Down
3 changes: 3 additions & 0 deletions tests/integration/create_cluster/minimal-1.22/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ spec:
authorization:
rbac: {}
channel: stable
cloudConfig:
awsEBSCSIDriver:
enabled: true
cloudProvider: aws
configBase: memfs://tests/minimal.example.com
etcdClusters:
Expand Down
12 changes: 12 additions & 0 deletions upup/pkg/fi/cloudup/new_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,18 @@ 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)
if err != nil {
return nil, err
Expand Down