Skip to content

Commit e8c8b92

Browse files
committed
[csi/aws] Bump templates to latest stable version
- Update manifests - Bump components version - Add API capability of setting Version + VolumeLimit - Remove snapshot-controller resources as it should be independent from any CSI driver Signed-off-by: dntosas <[email protected]>
1 parent af9abb4 commit e8c8b92

File tree

9 files changed

+124
-55
lines changed

9 files changed

+124
-55
lines changed

k8s/crds/kops.k8s.io_clusters.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,17 @@ spec:
258258
enabled:
259259
description: Enabled enables the AWS EBS CSI driver
260260
type: boolean
261+
version:
262+
description: 'Version of the CSI controller container Default:
263+
The latest stable release which is compatible with your
264+
Kubernetes version'
265+
type: string
266+
volumeAttachLimit:
267+
description: 'Value for the maximum number of volumes attachable
268+
per node. If specified, the limit applies to all nodes.
269+
If not specified, the value is approximated from the instance
270+
type. Default: -'
271+
type: integer
261272
type: object
262273
azure:
263274
description: Azure cloud-config options

pkg/apis/kops/componentconfig.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,16 @@ type CloudConfiguration struct {
838838
type AWSEBSCSIDriver struct {
839839
//Enabled enables the AWS EBS CSI driver
840840
Enabled *bool `json:"enabled,omitempty"`
841+
842+
// Version of the CSI controller container
843+
// Default: The latest stable release which is compatible with your Kubernetes version
844+
Version *string `json:"version,omitempty"`
845+
846+
// Value for the maximum number of volumes attachable per node.
847+
// If specified, the limit applies to all nodes.
848+
// If not specified, the value is approximated from the instance type.
849+
// Default: -
850+
VolumeAttachLimit *int `json:"volumeAttachLimit,omitempty"`
841851
}
842852

843853
// NodeTerminationHandlerConfig determines the node termination handler configuration.

pkg/apis/kops/v1alpha2/componentconfig.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,16 @@ type CloudConfiguration struct {
837837
type AWSEBSCSIDriver struct {
838838
//Enabled enables the AWS EBS CSI driver
839839
Enabled *bool `json:"enabled,omitempty"`
840+
841+
// Version of the CSI controller container
842+
// Default: The latest stable release which is compatible with your Kubernetes version
843+
Version *string `json:"version,omitempty"`
844+
845+
// Value for the maximum number of volumes attachable per node.
846+
// If specified, the limit applies to all nodes.
847+
// If not specified, the value is approximated from the instance type.
848+
// Default: -
849+
VolumeAttachLimit *int `json:"volumeAttachLimit,omitempty"`
840850
}
841851

842852
// NodeTerminationHandlerConfig determines the node termination handler configuration.

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/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.

0 commit comments

Comments
 (0)