Skip to content

Commit 8672ea7

Browse files
committed
bump GCE PD CSI Driver
1 parent cf27130 commit 8672ea7

File tree

39 files changed

+599
-192
lines changed

39 files changed

+599
-192
lines changed

pkg/apis/kops/componentconfig.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,11 @@ type EBSCSIDriverSpec struct {
984984
type PDCSIDriver struct {
985985
// Enabled enables the GCP PD CSI driver
986986
Enabled *bool `json:"enabled,omitempty"`
987+
// Version is the container image tag used.
988+
// Default: The latest stable release which is compatible with your Kubernetes version
989+
Version *string `json:"version,omitempty"`
990+
// Default StorageClassName is the name of the default StorageClass created for GCP PD CSI driver.
991+
DefaultStorageClassName *string `json:"defaultStorageClassName,omitempty"`
987992
}
988993

989994
// SnapshotControllerConfig is the config for the CSI Snapshot Controller

pkg/apis/kops/v1alpha2/componentconfig.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,11 @@ type EBSCSIDriverSpec struct {
10541054
type PDCSIDriver struct {
10551055
// Enabled enables the GCP PD CSI driver
10561056
Enabled *bool `json:"enabled,omitempty"`
1057+
// Version is the container image tag used.
1058+
// Default: The latest stable release which is compatible with your Kubernetes version
1059+
Version *string `json:"version,omitempty"`
1060+
// Default StorageClassName is the name of the default StorageClass created for GCP PD CSI driver.
1061+
DefaultStorageClassName *string `json:"defaultStorageClassName,omitempty"`
10571062
}
10581063

10591064
// SnapshotControllerConfig is the config for the CSI Snapshot Controller

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha3/componentconfig.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,11 @@ type EBSCSIDriverSpec struct {
980980
type PDCSIDriver struct {
981981
// Enabled enables the GCP PD CSI driver
982982
Enabled *bool `json:"enabled,omitempty"`
983+
// Version is the container image tag used.
984+
// Default: The latest stable release which is compatible with your Kubernetes version
985+
Version *string `json:"version,omitempty"`
986+
// Default StorageClassName is the name of the default StorageClass created for GCP PD CSI driver.
987+
DefaultStorageClassName *string `json:"defaultStorageClassName,omitempty"`
983988
}
984989

985990
// SnapshotControllerConfig is the config for the CSI Snapshot Controller

pkg/apis/kops/v1alpha3/zz_generated.conversion.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/zz_generated.deepcopy.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/model/components/gcppdcsidriver.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ func (b *GCPPDCSIDriverOptionsBuilder) BuildOptions(o *kops.Cluster) error {
3737

3838
if gce.PDCSIDriver == nil {
3939
gce.PDCSIDriver = &kops.PDCSIDriver{
40-
Enabled: fi.PtrTo(true),
40+
Enabled: fi.PtrTo(true),
41+
DefaultStorageClassName: fi.PtrTo("balanced-csi"),
42+
Version: fi.PtrTo("v1.21.6"),
4143
}
4244
}
4345

tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ spec:
1212
cloudConfig:
1313
gceServiceAccount: default
1414
gcpPDCSIDriver:
15+
defaultStorageClassName: balanced-csi
1516
enabled: true
17+
version: v1.21.6
1618
manageStorageClasses: true
1719
multizone: true
1820
nodeTags: ha-gce-example-com-k8s-io-role-node

0 commit comments

Comments
 (0)