If EBS CSI Driver is installed, create a new default SC

kubernetes · May 10, 2021 · 4ae45fe · 4ae45fe
1 parent da19ab4
commit 4ae45fe
Show file tree

Hide file tree

Showing 113 changed files with 183 additions and 39 deletions.
diff --git a/pkg/model/components/awsebscsidriver.go b/pkg/model/components/awsebscsidriver.go
@@ -31,8 +31,13 @@ var _ loader.OptionsBuilder = &AWSEBSCSIDriverOptionsBuilder{}
 
 func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error {
 	clusterSpec := o.(*kops.ClusterSpec)
-	c := clusterSpec.CloudConfig.AWSEBSCSIDriver
-	if c == nil {
+	cc := clusterSpec.CloudConfig
+	if cc.AWSEBSCSIDriver == nil {
+		cc.AWSEBSCSIDriver = &kops.AWSEBSCSIDriver{}
+	}
+
+	c := cc.AWSEBSCSIDriver
+	if !fi.BoolValue(c.Enabled) {
 		return nil
 	}
 

diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
@@ -138,6 +138,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -374,6 +375,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -704,6 +706,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:

diff --git a/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -146,6 +146,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -147,6 +147,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -502,6 +503,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:

diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -146,6 +146,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@@ -146,6 +146,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@@ -144,7 +144,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir
 
-echo "H4sIAAAAAAAA/+xW648bNRD/nr/CKqr6pbebvYYCq1Yi5AoXeldC0gcSqpBjTzYmXns7tvcuiD8ejb153oVS+hESKVnPy/P4zcwKbYMcWbNQVdljrOaGVzDzFnkFI82dA1cyjwF6whrPlQGcBuNVDSXbUuSOKcmKiPZ+agFRSSjZnz3GGGsBnbKGPWfnvUj4tdGhUsa9T8cdIXugbLYzmVXYiKwtMoHqwVb4n4nv0fc0P1k3wxS0OzDy783Qg3h/YIqxjvmbXzfAnrMjk6SRtecPekdan+VCZhuvLJWAHX1ma+ehlqMKbWjY84QBxrStrqAFXTJlFra3rWrJimyQDXrSihUggcCtVDM2znOtOwSBEbiO93WAYyZo3QMv5EgH5wEdKUILxsenPetPskFWPIkIVeZ+3irMYTgZzwDb5AHX2t5MULVKQwWy3MTAjTXr2gY3DH5ZsgXXLpIbNQxSgREQbz9jZBENeHCZa0UmYcGD9kk0XTOywfiSFUQLfmlR/cEpwGtLuB/qG752Q3Kjx9hcGTmUEsG5kvWz+KVmoQ6coG2VBCwZv3GUA8PnGoayVo5inKQSJ69e8RpcwwVcqQWItdAQyVeqVn7KTQUYz+SgEjAUgnyMpAllzHkw/q3VoYYrPgcdORcptP3G36e/thowBjYDYY1MzOvguVem2rr5DuZLa1eR+ZZrJU+zX1kJU3AelSCzkTYFZwMK+DlYzykJXsiU5i7ypfdNmefF+Vcxe0U56PeLQ8HN0Ok08gSmL+7TPO8xpmpeQclWX7usEpgpm1PNz3ijXIJRW2TnRawTMTT4CcICEGFTytfrZnPZ2HhAw/V4Eo+X1nnD61SdF7d7vF0TkQ8IHwI4vwQuASNYQMYaJ6u8qhAq7i0ey7649cgv4yN5pW43Kr+cTaG2Hs6ixNmx3g/U0knvWCGyjuXfOHK9hvtViEvtDiIgTCz6kg0GTyJlH4Bj5wLhmyrhyjznjcpUl7BM2LqhZGZwy+tGAxHuWPjx3cvZm+n4E0zktgGjZN4W+e83K7ez2I2b8ST2S8mKfj97OiBo5HHIuNQH33GxAiPLCLA0YEbWeLRaA17HVbkdNIJ7IFCPxhdTtxs13nOxvAD6nVLrCKVhtjZiAqisLFlR992pISCSl2QxufjN0+RisWMSUGgT35u/tIcDwojMT23wtM038+4E9sU2wrO6C3HXBDoBT0Ps2jSH92jl3TVBCA8ODqfRCEGC8YrrTaro6gna23X50cCbME3ojDyKc9l12u6N49G3/MY9Oh1kE6/ai2vPXxKYiSXIoFN5T9hwW5nPy083WMrTm0nEJXyBiiYSc2kzb+lTa33J8o+g6OLVbA/nRX+PY+NO3RwzwrLe7qALmIeqUqa65EZqav9NDNCm2X3JUZashtriOuMtV5r0nhX9/rV6bKyEhTsgP9wQFf277xHg2ZcPH8cs3xHdUA9k/77klM+E/AmnLOYtx1yred4lOt8J3EGqAX9jcZX2bddbRhHDmmvuPgRAnnr8cGhQOhsrr7lRC3C+uxi8yHfvEHndcV2v5pTpl/8X/r9WeNqsFb2CYTdhKN5Nvf8CAAD//wEAAP//kvdVx4wNAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
+echo "H4sIAAAAAAAA/+xW628bNxL/rr+CyCHIl3hX6+hyd4sEOEVOazV2qkp5FCiCgiJHK1ZccjMkV1Yf/3sx5Oppu2maj60N2LvzfvxmZoW2QY6sWaiq7DHG1+7li9loNr5A1QKW7JffeozV3PAKZt4ir2CkuXPgSuYxQE9Y47kygNNgvKqhZDuK3DMl2RbRy7ctICoJJfu1xxhjLaBT1rDn7LwXCT80OlTKuA/pdU/IHiib7U1mFTYia4tMoHqwE/5z4gf0A83P1s0wJe2OjPx1M/QgPhyZYqxj/ug3DbDn7MQkaWTt+YPeidYXhZDZxitLLWAnP7ON81DLUYU2NOx5wgBj2lZX0IIumTIL29t1tWRFNsgGPWnFCpBA4FaqGRvnudYdgsAI3ER/HQyZCVr3wAs50sF5QEeK0ILx8enA+pNskBVPIkKVuZu3CnMYTsYzwDZFwLW26wmqVmmoQJbbHLixZlPb4IbBL0u24NpFcqOGQSowAqL3M0YW0YAHl7lWZBIWPGifRJObkQ3Gl6wgWvBLi+pnTgleW8L9UK/5xg0pjB5jc2XkUEoE50rWz+IvDQvN5QRtqySNIV87qoHhcw1DWStHOU5Si1NUr3kNruECrtQCxEZoiOQrVSs/5aYCjO8UoBIwFIJijKQJVcx5MP6d1aGGKz4HHTkXKbXDwT+kv7EaMCY2A2GNTMzr4LlXptqF+R7mS2tXkfmOayXvZ7+2EqbgPCpBZiNtCs4GFPBdsJ5TEbyQqcxd5kvvmzLPi/P/xOoV5aDfL44Ft0un08gTmP51l+Z5jzFV8wpKtvqvyyqBmbI59fyMN8olGLVFdl7EPhFDg58gLAARtq18s2m2zsbGAxqux5P4emmdN7xO3Xl5c8DbDxHFgPAxgPNL4BIwggVk7HGyyqsKoeLe4qnsyxuP/DI+UlTqZqvy/dkUauvhLEqcnep9TSOd9E4VIutU/q2j0Gu4W4W4NO4gAsLEoi/ZYPAkUg4BOHYuEL6pE67Mc96oTHUFy4StGypmBje8bjQQ4ZaFb96/mr2djj/DRG4bMErmbZH/tF65vcVu3YwncV5KVvT72dMBQSOPS8alOXjBxQqMLCPA0oIZWePRag14HU/lbtEI7oFAPRpfTN1+1XjPxfIC6O+URkcoDbONERNAZWXJirrv7lsCIkVJFlOI/3uaQiz2TAIKXeI765fucEAYkfmpDZ6u+Xbf3YN9scvwrO5S3A+BTsDTEKc27eEDWnn7TBDCg4PjbTRCkGC84npbKnI9QXuzKT+ZeBOmCZ2RR3kuu0nbf3E8+j9fu0f3J9lEVwd5HcRLAjOxBBl0au89NtxO5svq0y2W8v7LJOIR3n6ouXSZd/Sptb5k+SdQdPF6doDzon/AsfGmbl8zwrLe3aALmIeqUqa65EZqGv9tDtCm3X3JUZashtriJuMtV5r0nhX9/rV6bKyEhTsiP9wSFf13XyHAs38/fByrfEt0Sz2S/eOWUz0T8iecqpi3HHOt5nlX6HwvcAupBvza4ird2262jCKGNdfcfQyAPM348dKgcjZWXnOjFuB85xi8yPffEHndcV2v5lTpV/80/u/WeLqsFX2CYbdhKN9tv38HAAD//wEAAP//cpKQkKINAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
 echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml
 

diff --git a/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
@@ -144,7 +144,7 @@ function download-release() {
 echo "== nodeup node config starting =="
 ensure-install-dir
 
-echo "H4sIAAAAAAAA/6RUW2vbMBR+9684FEpfOtkOXdlECxsJo4W1C+njKEOxTlwRWcc9ktwF9uOHlFuTwdjFL7a+c//OJzeWoh6TW5hWFgCdcqrFh0CsWhxb5T16CYEjFg25oIxDnkUXTIcSdojeG3XK0uR8XwZkNhol/CgAAAZkb8jBNYyKDHztbWyN84/r4x4QJ4bEPqVouW/EUIuGzcnO+c/cX+GvIv86VvB6aH+Q5N/TpI/m8SAVwMb4Lax6hGs4SpkixDA6KY6i/qsFQX0wlFYAR8/Dygfs9Lhlij1crzUAYKn9jANaCcYtqNhtVUItLsRFoalZIicR+KXpb50PytqNgpZxjlOm76usERt9QB7fTmYS6qoS7y9FJaqyrpOxjzN8juhDtnUFwBP54FSHe1WdfVAv/qwAMJ1qUcLynRdtw8JQmSq96XOpoRajWlQHrY9yKxZDakQ5cquOov8Yw5OEhbI+DdrkwSdsBmQJfs3GDp8RBQllnoOinjINRidH9eL3w03uH9azXV6IStTVKwt1yji5PQpLjbIFADo1tzjBeWxb49ob5bRF3l5BABxMkxZ2o1hL6LAjXgk1KGNT3FVdVXfm3JHGhT+AT7egSW//iRGv3p6eZ+Z+cd2iB76/X0Hic33rpyqxWA6KS2vm5Ybocu9wtAkAh+GFeDnNMr5X+c/iTDKQu1P+OSIrjXuhZDKrMtPZk75TzizQh01hDE0uxg4D+rLbWH3xEwAA//8BAAD//2mRNabqBAAA" | base64 -d | gzip -d > conf/cluster_spec.yaml
+echo "H4sIAAAAAAAA/6RUbWvbMBD+7l9xFEq/dLIdurKJFrYlGy2sXUg+jjIU6+KKyDpXL87Ctv8+JCdxk8HYi7/Yeu5N99xzrjQFOSazVDXPAMTavX83H89vJ1Z1aDl8+5EBNMKIGueerKhxrIVz6Dh4GzCryHihDNpZMF41yGGPyMEoY+4qVfnUobVKIofvGQBAh9YpMnANoywBn1sdamXcQ38cAHaiiA0pWW3binUlq6w62Tv/mfsz/FnkX8cy2zftDpL8e5r4UT0cpALYGr/4TYtwDUcpYwTrRifZUdR/XYFR6xXFEcDRM984j40c15ZCC9e9BgA01R+xQ81BmSVl+6lyKNkFu8gkVSu0UQRupdpb47zQequgVVjg1NLXTdKIDs6jHd9OZhzKomCvL1nBirwso7ENM3wK6HyyNRnAIzlvRIODqs7eiLU7ywBUI2rksHrlWF1ZpiiPlV60qVRXslHJioOrj9JVNPq0CIbMpqHg3gb/yGEptIuNVqnx3XK4no09PiPyHPLUBwU5tdQpGR3F2g3NTe7nfW+XF6xgZfHMQo1Qhu+OTFMldAaARiw0TnAR6lqZ+kYYqdHuVhAAO1XFgd0IKzk02JDdMNEJpWPcVVkUd+rckMSlO4BPd6CKb/fBIl69PD1PzP3iukMPfH8/gshnv/VTEVnMO2FzrRb5luh8cDiaBIBBvya7miYZ34v0ZzEqGsjcCfcU0AqJg1ASmUWe6GxJ3gmjluj8tjD6KhWzBj26vNlaXfYTAAD//wEAAP//kYB8zAAFAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
 
 echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml
 

diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml
@@ -138,6 +138,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -485,6 +486,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:

diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml
@@ -138,6 +138,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -467,6 +468,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:

diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
@@ -138,6 +138,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: docker
   containerd:
@@ -470,6 +471,7 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: docker
   containerd:

diff --git a/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
@@ -138,6 +138,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -467,6 +468,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
@@ -138,6 +138,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -467,6 +468,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:

diff --git a/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...le_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
@@ -136,6 +136,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   gceServiceAccount: default
   manageStorageClasses: true
   multizone: true

diff --git a/...le_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
@@ -136,6 +136,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   gceServiceAccount: default
   manageStorageClasses: true
   multizone: true

diff --git a/...le_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
@@ -136,6 +136,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   gceServiceAccount: default
   manageStorageClasses: true
   multizone: true

diff --git a/...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
@@ -136,6 +136,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   gceServiceAccount: default
   manageStorageClasses: true
   multizone: true

diff --git a/...ter/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...ter/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/...egration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/...egration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -137,6 +137,7 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
+  awsEBSCSIDriver: {}
   manageStorageClasses: true
 containerRuntime: containerd
 containerd:

diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml
@@ -138,6 +138,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd:
@@ -467,6 +468,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
 
   cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
   cloudConfig:
+    awsEBSCSIDriver: {}
     manageStorageClasses: true
   containerRuntime: containerd
   containerd: