[csi/aws] Bump templates + add support for warm pools

k8s/crds/kops.k8s.io_clusters.yaml

@@ -260,8 +260,20 @@ spec:
                       driver
                     properties:
                       enabled:
-                        description: Enabled enables the AWS EBS CSI driver
+                        description: 'Enabled enables the AWS EBS CSI driver Default:
+                          false'
                         type: boolean
+                      version:
+                        description: 'Version is the container image tag used. Default:
+                          The latest stable release which is compatible with your
+                          Kubernetes version'
+                        type: string
+                      volumeAttachLimit:
+                        description: 'VolumeAttachLimit is the maximum number of volumes
+                          attachable per node. If specified, the limit applies to
+                          all nodes. If not specified, the value is approximated from
+                          the instance type. Default: -'
+                        type: integer
                     type: object
                   azure:
                     description: Azure cloud-config options

nodeup/pkg/model/awsebscsidriver.go

@@ -0,0 +1,58 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package model
+
+import (
+	"k8s.io/kops/upup/pkg/fi"
+)
+
+// AWSEBSCSIDriverBuilder writes AWSEBSCSIDriver's assets
+type AWSEBSCSIDriverBuilder struct {
+	*NodeupModelContext
+}
+
+var _ fi.ModelBuilder = &AWSEBSCSIDriverBuilder{}
+
+// Build is responsible for configuring the EBS CSI Driver stuff
+func (b *AWSEBSCSIDriverBuilder) Build(c *fi.ModelBuilderContext) error {
+	csi := b.Cluster.Spec.CloudConfig.AWSEBSCSIDriver
+
+	if csi == nil {
+		return nil
+	}
+
+	// Pulling CSI driver image
+	image := "k8s.gcr.io/provider-aws/aws-ebs-csi-driver:" + *csi.Version
+	b.WarmPullImage(c, image)
+
+	// Pulling CSI sidecars images
+	sidecars := []string{
+		"csi-provisioner:v2.2.0",
+		"csi-attacher:v3.2.0",
+		"csi-snapshotter:v4.0.0",
+		"csi-resizer:v1.1.0",
+		"csi-node-driver-registrar:v2.1.0",
+		"livenessprobe:v2.2.0",
+	}
+	for _, s := range sidecars {
+		image = "k8s.gcr.io/sig-storage/" + s
+		b.WarmPullImage(c, image)
+	}
+
+	return nil
+
+}

pkg/apis/kops/componentconfig.go

@@ -836,8 +836,19 @@ type CloudConfiguration struct {
 
 // AWSEBSCSIDriver is the config for the AWS EBS CSI driver
 type AWSEBSCSIDriver struct {
-	//Enabled enables the AWS EBS CSI driver
+	// Enabled enables the AWS EBS CSI driver
+	// Default: false
 	Enabled *bool `json:"enabled,omitempty"`
+
+	// Version is the container image tag used.
+	// Default: The latest stable release which is compatible with your Kubernetes version
+	Version *string `json:"version,omitempty"`
+
+	// VolumeAttachLimit is the maximum number of volumes attachable per node.
+	// If specified, the limit applies to all nodes.
+	// If not specified, the value is approximated from the instance type.
+	// Default: -
+	VolumeAttachLimit *int `json:"volumeAttachLimit,omitempty"`
 }
 
 // NodeTerminationHandlerConfig determines the node termination handler configuration.

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -835,8 +835,19 @@ type CloudConfiguration struct {
 
 // AWSEBSCSIDriver is the config for the AWS EBS CSI driver
 type AWSEBSCSIDriver struct {
-	//Enabled enables the AWS EBS CSI driver
+	// Enabled enables the AWS EBS CSI driver
+	// Default: false
 	Enabled *bool `json:"enabled,omitempty"`
+
+	// Version is the container image tag used.
+	// Default: The latest stable release which is compatible with your Kubernetes version
+	Version *string `json:"version,omitempty"`
+
+	// VolumeAttachLimit is the maximum number of volumes attachable per node.
+	// If specified, the limit applies to all nodes.
+	// If not specified, the value is approximated from the instance type.
+	// Default: -
+	VolumeAttachLimit *int `json:"volumeAttachLimit,omitempty"`
 }
 
 // NodeTerminationHandlerConfig determines the node termination handler configuration.

pkg/model/components/awsebscsidriver.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package components
+
+import (
+	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/upup/pkg/fi"
+	"k8s.io/kops/upup/pkg/fi/loader"
+)
+
+// AWSEBSCSIDriverOptionsBuilder adds options for the AWS EBS CSI driver to the model
+type AWSEBSCSIDriverOptionsBuilder struct {
+	*OptionsContext
+}
+
+var _ loader.OptionsBuilder = &AWSEBSCSIDriverOptionsBuilder{}
+
+func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error {
+	clusterSpec := o.(*kops.ClusterSpec)
+	c := clusterSpec.CloudConfig.AWSEBSCSIDriver
+	if c == nil {
+		return nil
+	}
+
+	if c.Version == nil {
+		version := "v0.10.1"
+		c.Version = fi.String(version)
+	}
+
+	return nil
+
+}