diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go index 5d86e93a94..838f78ce19 100644 --- a/nodeup/pkg/model/kubelet_test.go +++ b/nodeup/pkg/model/kubelet_test.go @@ -284,6 +284,7 @@ func BuildNodeupModelContext(model *testutils.Model) (*NodeupModelContext, error nodeupModelContext.NodeupConfig.APIServerConfig.ServiceAccountPublicKeys = saPublicKeys } + nodeupModelContext.NodeupConfig.ContainerRuntime = nodeupModelContext.Cluster.Spec.ContainerRuntime nodeupModelContext.NodeupConfig.ContainerdConfig = nodeupModelContext.Cluster.Spec.Containerd updatePolicy := nodeupModelContext.Cluster.Spec.UpdatePolicy if updatePolicy == nil { diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index 13ed42232a..3c9a1ef132 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -140,7 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -containerRuntime: docker containerd: logLevel: info docker: @@ -176,7 +175,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: 6auBaW1ndtw6OqCNSUTBHmtW6bXH/kMU3WzRyFTeybQ= +NodeupConfigHash: oAA7lzHKBGNpkWIR+fWvVROQFhLpUr7OZb5rUuzVC9c= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 6d57b76422..4be4abe63c 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -140,7 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -containerRuntime: docker containerd: logLevel: info docker: @@ -176,7 +175,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: LCv1ZDd/8Ynuu2gWmHWnRUDDg9CEpFmjnutcYrzMHYs= +NodeupConfigHash: g1fTKq7LYsnY6/NvPHB/1Gt/ob63v8vQiug49GFpkXs= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 6d57b76422..4be4abe63c 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -140,7 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -containerRuntime: docker containerd: logLevel: info docker: @@ -176,7 +175,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: LCv1ZDd/8Ynuu2gWmHWnRUDDg9CEpFmjnutcYrzMHYs= +NodeupConfigHash: g1fTKq7LYsnY6/NvPHB/1Gt/ob63v8vQiug49GFpkXs= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index ce483b425d..51930142d8 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -140,7 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -containerRuntime: docker containerd: logLevel: info docker: @@ -161,7 +160,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: Bh4YTRR4vo/SNr+XIt/XQmPIBYtoyuQRLW/8w60U/Vg= +NodeupConfigHash: pAZl6BNqrLJs7/vcZllKJh5EHLmf29+dWuSdwLzN45Y= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index a655fba909..f4b3d4613f 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -140,7 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -containerRuntime: docker containerd: logLevel: info docker: @@ -161,7 +160,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: aK1PZEMBgHAGOeumVRsKASOjZqW+GHyIe/NV9G/xOQI= +NodeupConfigHash: KU7Pbg5ZGPoNli1zimki/YkE1mfEFXwQrnGYL6V8Mk8= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index a655fba909..f4b3d4613f 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -140,7 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -containerRuntime: docker containerd: logLevel: info docker: @@ -161,7 +160,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: aK1PZEMBgHAGOeumVRsKASOjZqW+GHyIe/NV9G/xOQI= +NodeupConfigHash: KU7Pbg5ZGPoNli1zimki/YkE1mfEFXwQrnGYL6V8Mk8= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt index 4cd2f52737..53db861904 100644 --- a/pkg/model/tests/data/nodeupconfig_0.txt +++ b/pkg/model/tests/data/nodeupconfig_0.txt @@ -3,6 +3,7 @@ APIServerConfig: image: CoreOS ServiceAccountPublicKeys: "" CAs: {} +ContainerRuntime: docker FileAssets: - content: user,token name: tokens diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt index 25fbc422d6..6db895dbe5 100644 --- a/pkg/model/tests/data/nodeupconfig_1.txt +++ b/pkg/model/tests/data/nodeupconfig_1.txt @@ -3,6 +3,7 @@ APIServerConfig: image: CoreOS ServiceAccountPublicKeys: "" CAs: {} +ContainerRuntime: docker FileAssets: - content: blah blah name: iptables-restore diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt index 25fbc422d6..6db895dbe5 100644 --- a/pkg/model/tests/data/nodeupconfig_2.txt +++ b/pkg/model/tests/data/nodeupconfig_2.txt @@ -3,6 +3,7 @@ APIServerConfig: image: CoreOS ServiceAccountPublicKeys: "" CAs: {} +ContainerRuntime: docker FileAssets: - content: blah blah name: iptables-restore diff --git a/pkg/model/tests/data/nodeupconfig_3.txt b/pkg/model/tests/data/nodeupconfig_3.txt index 0794438f68..24ebad11ce 100644 --- a/pkg/model/tests/data/nodeupconfig_3.txt +++ b/pkg/model/tests/data/nodeupconfig_3.txt @@ -1,4 +1,5 @@ CAs: {} +ContainerRuntime: docker FileAssets: - content: user,token name: tokens diff --git a/pkg/model/tests/data/nodeupconfig_4.txt b/pkg/model/tests/data/nodeupconfig_4.txt index 5144ceb521..657eba8aac 100644 --- a/pkg/model/tests/data/nodeupconfig_4.txt +++ b/pkg/model/tests/data/nodeupconfig_4.txt @@ -1,4 +1,5 @@ CAs: {} +ContainerRuntime: docker FileAssets: - content: blah blah name: iptables-restore diff --git a/pkg/model/tests/data/nodeupconfig_5.txt b/pkg/model/tests/data/nodeupconfig_5.txt index 5144ceb521..657eba8aac 100644 --- a/pkg/model/tests/data/nodeupconfig_5.txt +++ b/pkg/model/tests/data/nodeupconfig_5.txt @@ -1,4 +1,5 @@ CAs: {} +ContainerRuntime: docker FileAssets: - content: blah blah name: iptables-restore diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data index 2c709823c9..778a412150 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -267,7 +266,7 @@ CloudProvider: aws ConfigBase: memfs://tests/additionalobjects.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: p7tlal/KPnkn7fyErE5SyWbXgZoNMCXB+6Od1yiVQmc= +NodeupConfigHash: h0BunyGu9OkI0rtjDr/K+z7SiZ4Xv/76UoDZhtzvihE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data index 33dae51acb..c6332fbbc0 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -189,7 +188,7 @@ ConfigServer: server: https://kops-controller.internal.additionalobjects.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: NBjIW/6LtD430wIAzZ+F4dzgawxUko2txgqMMQXUrnQ= +NodeupConfigHash: xy6vM/UBskzo5J2wYiqXaqyJmSTHuj4hFfiCErM/HzU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2d40d6a8e4..d05a449c8a 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: additionalobjects.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content index f06aac65d1..3b13fd078e 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: additionalobjects.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data index 5bf2b1219c..4c509adef4 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info version: 1.4.13 @@ -165,7 +164,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer -NodeupConfigHash: vMi9Desod9xbuTf+IOVqaO3/VqrVtrOHP20EojREMJU= +NodeupConfigHash: gouzgmaZZLVcikzMdZQd95zyHRfnLi0LcJFOumNkFFs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index cefb98a93e..15340ff0ba 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info version: 1.4.13 @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 5riiUtWaXLjbfRaTO/R7YcCfdXNmNtRfKdFQOEA+xAU= +NodeupConfigHash: AWUu6EmchBvXxCSdVoStlAHel5DQzNIdE0hKzbt6uQI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data index cec64f6f16..9ea6215852 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info version: 1.4.13 @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 354orPsI7dNYmQ6/gBPyTojuACUP6YzTe5OmY4RWhYs= +NodeupConfigHash: +y00CPn+YVJ6IK/PcD4OK/T6EZxvFWg+wu8PlbCJbo4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content index cf5ef2732f..72d75f6247 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content @@ -131,6 +131,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f8d2852142..7ff66d0f5f 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -221,6 +221,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content index 54a27ce0bc..eb0510740d 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content @@ -11,6 +11,7 @@ Assets: - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 730c281092..39eda965c6 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oMCMfE1OWGyvcyAxoa3sinKPdfd/Eg//0stpO1T8iUM= +NodeupConfigHash: nNtMxjPThhsud1bMFio8XGBi8WwN7W/Xc/mOhDlf+KI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index 24faca32c2..8b8790b4c3 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JPTpr01xOStF8ysLrFeIddn3Em2fa7vCnDqPrHH48IM= +NodeupConfigHash: z8VB/G1H4+VqW7eiejN5ovoP/L9F/z71+9P/4RlTCXw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f6ba1fa68f..a8b96fa85d 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content index 3c5e64001a..25543e9209 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 65a261eab6..ff4db849cb 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: p0ZZ+HODqUieptr9geb4fDHAOyt2wLFDJ8/oim3kaYs= +NodeupConfigHash: VcCRrtjWyDm3XNBQNFvr7dAYN7Q3AI2DtVgQvZYcxdM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index 34d226541d..ef10adaa34 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -134,7 +134,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -197,7 +196,7 @@ ConfigServer: server: https://kops-controller.internal.bastionuserdata.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: dpCjEbuz5MZFgmq/MZhEkb/rTk9w86Opce1WxLFqF0s= +NodeupConfigHash: Pu0yc8yQwWr+aaiFn11egpa14ulacYG/Erc9f6mpR70= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content index 5a1d231fd3..0fb082c0ce 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: bastionuserdata.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 303195ecd3..ae7fc682f1 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: bastionuserdata.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content index 2153e4bc97..3316e62278 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: bastionuserdata.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index 1a2e5116a1..6721637d5c 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -134,7 +134,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -275,7 +274,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: RA6/v8JUp+Lp0Pmk49fJS8mSNq9kB7fXxarQF18/VRw= +NodeupConfigHash: f36nXKgKdXujEulb57nmPQI3lsytj5GIgcG8IjdM1h4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index 3428da461c..bc14d535ab 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -134,7 +134,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -197,7 +196,7 @@ ConfigServer: server: https://kops-controller.internal.complex.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: G9hdx/40IzUCeucA1rz2pgPSksEQ6cA4QFF/YemGWxI= +NodeupConfigHash: IyDGvTCDJ4hOMvWS0KCCPayUEdtZPTZpXV9nCBh7MEs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d1a210652d..a01f3b66a3 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -229,6 +229,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: complex.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content index dba4bd9ce5..e9147859c0 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: complex.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index a8e310b643..660b93b31c 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xWTXPbNhO+61dg8k5uMSnGjt+Wk4sqpzGbOGWlpO4VBlYUKhBgFwBt9dd3FiD14ShNO51mesh4xjb3WSz249mHFNoGObdmpZpywljLDW9g6S3yBuaaOweuZB4DTIQ1nisDuAjGqxZKtrPIPSgpirbNW+hBl0yZlZ0whsEIAhjrAZ2ypmRFVmQXkyPDZVZcTKQVG0BydhvVVcZ5rvWQAhiB284ra4aMmQlaT8ALOdfBeUBHB6EH492j+86zF9llrFCZk9Am3MGsrpaAfbqfa23va1S90tCAHHJgjBtrtq0Nbhb8umQrrl00d2oWpAIjIN59xigiGvDgMteLTMKKB+2Ta7pmboPxJSvIFvzaovqdU3k3VkLJZvqeb92M0pgwdqeMnEmJ4FzJpln8mTAWB1ij7ZUELBk8eEDDNbXB8DsNM9kqR3XWOjTKDKm94y24jgt4q1YgtkJDNL9VrfILbhrA+ExZKgEzISjRaLpKVRxS5ND+3mrAWMMShDUygTfBc69Ms0vmFu7W1m4i+DPXSn4afmclLMB5VILCRtsCnA0o4KdgPadSvZCpo0N9a+87V+Z58fz/sVNFeTGdFseeP/aAqOQ4rTzR5n8njz6fMLYC7gPCa+5hINd8Wd2oJpU7u12W7AlR5EnEKvMeAVLTZ7fLDwahUUTRAy/V8gZKlhDcZptvXKZsTrw5451yiYp9kT2/jLMmQIOvEVaACCMd3m+7sYjKpPFXdXy8ts4b3qbhvno4wPYrSqUh/BbA+TVwCRgJBzJSJEXlTYPQcG/xse+rB4/8Ov5LWamH8cgvZwtorYez6HH2+NxrtKFL5x4fiNBj/w+OUm/h9BFCSTBABITaoi/ZxcV5tBzyt3IuUP/HCfNOZWpoWCZs21EzM3jgbaeBDB9F+OH2zfLDovobIXLbgVEy74v81/uN20ccBKuq47qVrJhOs8sLYlxexNTTgn3HxQaMLCNxz6NIza3xaLUGvIlqvRMrwT3Qtsyrq4Xby5X3XKyvgH4vaCeF0rDcGlEDKitLVrRT96dCIlKqFDbl+e1lyrPYg8QWeiOcbKKIah0Q5nTHwgbaoJ1wftm9ErvunbVD+/YLphOpNUSpSckc2HY9Pd6e4OBYKOcIEoxXXI9joKtrtA/b8rP97MIiMT9i7WfK6WLQgwoOMiOHpViDDDqR5Mt22u2u/mcNHlSv/PSrVzSkGVeoSC6Z2zoPrdzZF9b6kuV/heJX75YHm1hMDxAbPxzGx4y2bf+SvYK70DTKNNfcSE0CNRYCfXptXXOUJWuhtbjNeM+VpnMvi+n0Rj0zVsLKHZmfjkZFf933CPDyxdNnsd8fuY7WI99/Zd40i7TNNacJ5D3HXKu7fBhSvnf4aE06KyuzQj4fvxWr0+TpeHBQnsevtc7KG27UCpwfLgQv8v2HVd4OKClYh9aD8G8I08P3yH4SYzXDRlDzdphbBy/tvXmNXMCoi+dRFk9Ac1ReCa5rKx3RxU1aTpHffCXqV6L+t4n6BwAAAP//AQAA///eqS9I7w0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xWTXPbNhO+61dg8k5uMSnGjt+Wk4sqpzGbOGWlpO4VBlYUKhBgFwAt9dd3FiD14ThNO51mesh4xjb3WWC/nn1IoW2Qc2tWqiknjLXc8AaW3iJvYK65c+BK5jHARFjjuTKAkhy1bd5CD7pkyqzshDEMRhDAWA/olDUlK7Iiu5icGC6z4mIirdgAkrPbqK4yznOthyhgBO46r6wZkmImaD0BL+RcB+cBHR2EHox3D+KdZy+yy1iEMo9Cm3AHs7paAvYpPtfa3teoeqWhATnkwBg31uxaG9ws+HXJVly7aO7ULEgFRkCMfcboRjTgwWWuF5mEFQ/aJ9cUZm6D8SUryBb82qL6nVN5N1ZCyWb6nu/cjNKYMHanjJxJieBcyaZZ/JkwFmdUo+2VBCwZbD2g4ZraYPidhplslaM6ax0aZYbU3vEWXMcFvFUrEDuhIZrfqlb5BTcNYHymLJWAmRCUaDRdpSqOWXBsf281YKxhCcIamcCb4LlXptkncwt3a2s3EfyZayU/Db+zEhbgPCpB10bbApwNKOCnYD2nUr2QqaNDfWvvO1fmefH8/7FTRXkxnRannj/2gKjkOK080eZ/jx59PmFsBdwHhNfcw0Cu+bK6UU0qd3a7LNkTosiTiFXmPQKkps9ulx8MQqOIokdequUNlCwhuMs237hM2Zx4c8Y75RIV+yJ7fhlnTYAGXyOsABFGOrzfdWMRlUnjr+r4eG2dN7xNw321PcIOK0qlIfwWwPk1cAkYCQcyUiTdypsGoeHe4kPfV1uP/Dr+S1mp7Xjkl7MFtNbDWfQ4e3juNdrQpXMPD0Toof8HR6m38PgRQkkwQASE2qIv2cXFebQc87dyLlD/xwnzTmVqaFgmbNtRMzPY8rbTQIaPbvjh9s3yw6L6G1fktgOjZN4X+a/3G3e4cRCsqo7rVrJiOs0uL4hxeRFTTwv2HRcbMLKMxD2PIjW3xqPVGvAmCvJerAT3QNsyr64W7iBX3nOxvgL6vaCdFErDcmdEDaisLFnRTt2fColIqdK1Kc9vL1OexQEktpTsE00UUa0DwpxiLGygDdoL55fdK7Hv3lk7tO+wYDqRWkOUmpTMkW3f09PtCQ5OhXKOIMF4xfU4Bgpdo93uys/2swuLxPyItZ8pp4uXHlVwlBk5LMUaZNCJJF+2024f+p81eFC98tOvXtGQZlyhIrlkbuc8tHJvX1jrS5b/FYpfvVsebWIxPUJs/HAYHzPatsNL9gruQtMo01xzIzUJ1FgI9Om1dc1RlqyF1uIu4z1Xms69LKbTG/XMWAkrd2J+OhoV/XXfI8DLF0+fxX5/5DpaT3z/lXnTLNI215wmkPccc63u8mFI+cHhozXprKzMCvl8/FasHidPx4OD8jx+rXVW3nCjVuD8EBC8yA8fVnk7oKRgHVoPwr8hTA/fI4dJjNUMG0HN22NuHby09+Y1cgGjLp5HWXwEmqPySnBdW+mILm7Scrr5zVeifiXqf5uofwAAAP//AQAA//9dnj5n0g0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1SOy0oEMRBF9/mK/EBPEHxgwI2tjC8yUZmF7mrS1dqYpEIq6cffSzOr3l7uOZzWU+1spnHoMGsJE4uWYj/83AOjlgFDz1op5ysXzLzDGULyuHMUlKOQMvJmFM+RC0SH+0w1GQirBFa2qdwU5NJcwPb0QR61bCmWTN56iCgMdVjTOeQJ+FdL475Ow+3e3ryM08m9hfn4d3lYDu+f5YiTfYivV0u9Vt7k78c78Q8AAP//AQAA//8RZnXn1QAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1SOTWrDMBBG9zqFLuCYpKSkgi4SgdNQkqYt9Gc5SJM4MNIIjVQXn76Yrrz9+N7jWeLqz5l/bh6z0TCIshwvt+sOBI0OGC5i2tZRlYJZFvgLIREuHIfWcUgZZTaqQ5QC0eE+c00nCJMEJrap0hSU0ixhfnpjQqMtx5KZzgQR1Yk91vQf8gTSG73KY7cb1na77+786xcf15E238eyfO633efH+2HzQg/3/biK10f1BwAA//8BAAD//1j+I9XVAAAA" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index 2ba262ee89..d6ccc3b726 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/2yST2/bPAzG7/4URIHe+sp22zfYhF6KBGuDrUOQbNiZsWhXiCxmlOQ1336Q82/ZejL8/B6JpB42jpOZsm9tpwuAHj12tIos2NHUYQgUNERJVDTsI1pPskw+2p40nBRzhibf4rj7QgM5Dda3XABI8k0GAANJsOw11KpW98WFMFH1fWG42ZBkc9jY7dyHiM4dWtikNS2E33YZNy6FSDKdz5Ya6qpSHyeqUlVZ1xlu05J+JgpxZH0BYHvsSINQZ0OUndp8CMpyme/8bzteOtTqdqKqiwFux6KOYi6Jnv2u5xQeU3zV0KILlIt1wmk7EzuQaAi7EKk3J33JHDWUY8eczEJ4sCYb6S2SeHTnWWZfV/tRJveqUnX1B+EerdfHX+W4GQ+Sx7WjGa1T11nfPaM3juQYGQANtomW/TOK0dBTz7JTOKB1+dxDXVUv9sazoTZcyNdH0eZv+CRED/9f34xv+I/1qF54C4CWMCahJ4wU9ulPV/MX2wnmlh5/rDRc5T6vRjb334Ro4VJnM/vu90nllzq5chbNuKwLzAmUA0rp7Lo8hFSeDX+lCLBlM/et4PS4qvP3F2KLKZC+U5P9mRf0tqUQDwUpNmMR8RQplP2BhmwWjtTEz5m5GbWYXDwncZxm1bySSePjnVh4TdHwL/8k2NCCxLLRcFeF99FUbLQNugWbkNclFL8BAAD//wEAAP//zq8+WsUDAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/2ySQW/bOBCF7/oVRIDcspSUZI1dIpfAxibGNoURt+h5TI4UwhTHnSHV+N8XlO2kbnMSNN8jH2fe2EDZzSl2vjeVUgNE6HGdiKHHeQARFKMSZ6wsxQQ+IrsiDNR/whGDUT52VCnFOdoClBqRxVM0qtWtvq3OCjPd3laO7Ba5iGXrd8soCUI4umzzBldMr/uCbciSkOfLxbNRbdPof2e60U3dtgXu8jN+zyhpYkOllB+gR6MYey+J93r7j2hPdbnzr9106djq65luzhq4nkwDpmIJkeJ+oCz3Ob0Y1UEQLGY9U94t2I/IRsleEg7urf5MlIyqpxdTdium0bsixNeEHCG897L4vD60MrvVjW6bXwgN4KM5/epAdjqIETYBF7jJfe9j/wjRBeRTKkrh6G3yFB+BnVEDDsR7DSP4UM7dtU3z5K8iOezkrHx5Kvrylf8Y8e7vy6tphn9IT9UzbaVUh5Ay4wMklEP68/XyyfcM5Un339ZGXZR3XkxsGb8w4irk3hf2NR6SKpN6U5Us7LSPKygJ1CNwHfymPoZUvwt+S1GpHbll7Bjmp1VdfrwQO8iC5kbPDmeeIPoOJR0NMdnJhCMmlHo4UilipoQ2/V9YWGAHOaT3JE7drO0LujwN743JS06OfsQHBosrZE/OqJtGPkZz9slbCCtyUtZFqp8AAAD//wEAAP//9hukL6gDAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/6yUTY+qSBSG9/4K9ua2iIpg0osDBVjaIAjCxR3yjXwUX5aa+fGTtie5mczNZDLpWtTifXOexcmTI5fNGJldc8ujuNswAe0nclMneWrH3S3uNhOGkUGOuyFP8jAY4n7D/DFhGIb58fkkRcMGIytHB6tYBkd5pa9ex1i6FLIMxzwFiiVIsa4SMFoJCYaNBA5Otg6sJtutZuPLAlmKJNMT6FJ6Vws4vSBSargS6A7yhrlfuY9L5bLnn/rgcwrdZqGhFwo1nrDQUUgPCKj3mT1/ZS/IqyjA148+VcFHrmUhhc67yNuVYbUqI819fnhGpquUIsvf7Zszzm6hAZYiSRagF8SmQG3YSWCoePHsWOcqXLveE260SHTy3B1KzxL4OX/TFr4ZcC2keO0umz1NXPaB0/kLUgzTLZ8szRm9mmA6ppMciYgfQrNVFJWyMlAFIDBkXQGKUh+5R9YEazuTwEKQKtrXYkHQYH6KFKpIM2qpOugSJALdWq+BgyT5impoi6dbOOFHuaOo3y1nexG5632TneAvyD83D6wCkhCxi8Tn6Nrbk+TAiS3mxBUZOXkZBiLkrnYgqR0KL8hQWX3Ld+F9WDjT7rISRNMdnmxFZ+HeuR+ufLrlZFmePrbJg6Pv77+8UQz0e2v+r1W3yg7YA5R+9XP/vVY5Ovd7qz6Lb7NKV3l1GZwjErPHE3k8roFEPHqWa3pJkszXDnSa9Pwx+hhP7dqSjWpXzZR2/YJ43uGZ6z7KsWhfwpKgKW/lO9ZYKC0h7ukbrfrAFeHhWJgItnyd4Wkfeu6wsMRL/a9WuZZ7X+mnYQQcx+Zois1qfh+Iw9m8ektyYbfE8r0uv9QUpfUJcWOfha5qDkHcfIhaMgqBv9zvpLht01VTlMu2OtZOVvwXq/qvS8Zkw0D6zWx2bUj/I2zqoWvKMu7e8nqIuzoo38KmIl3c92/xPahIGX8Gm4UoCLMJrvshqMNY65qRGEEVb5i6ieL+78WxKeMNYzRRPPn8RvJ1SrdBn20YOVAafCZPwSh4dI6MDKfc7DjekqxNxdFE54A0mV4I4OH3yZ8AAAD//wEAAP//dEB/IZcFAAA=" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/6yUTY+qSBSG9/4K9uZeERTBpBcHqkBUEASh6R0iIMhH8WWpmR8/aXqSm8ncTCaTrkUt3jfnWZw8OUpRDxerre/ZJW7XTEi7iVJXSZY6cXuP2/WEYRRQ4rbPkiwK+7hbM39MGIZhfnw+GWu6ySj46OqqroCLx3TsDV2Xz7miwDFLgeoypLqhEjAbGYmmg0QOTo4BrKY4jeboZx7ZWFboCQw5fag5nEaInJqeDIaL/H4elN7zXHrsx7vRBxymm2tkGjmm5gt4A0X0gID6n9nrVzZCxiKHwDgGVIUAebaNMJ23F39bROWyuGjea++bV0OlFNnBdld/6Nd7ZIKNZdkGNEIcCtSBrQymqvOvlnVv4q3tfPFO88Qgr+2h8G1RmAt3jQ+skGsg1Vfeot7RxGOfejofIXk/3QjJwprRmwWWa7nJkUj6U6w3GKuUVYBigNBUDAwUpQHyjqwF9mYmg40gxdrXYkHUYH66YIrlGbVVAwwZEpFu7HHgIMsBVk2Nf3m5G+2LLUXddjHbSchb7errCf6C/HPzwGKQxQvLJwFHV/6OJAdOanROWpKBUxZRKEHmaQeSOpE4QvrS7hqhjR49707b81KULK9/sSWdRTv3cbgJ6YZTFGX63CRPjr69/fIGm+j31vxfq+6lE7IHKILyffe9VrkG93urPotvs8pQBXURflxIzB5P5Pm8hTLx6YdS0XOSXAPtQKdJJxwv++HUrGzFLLflDDerEeL7h1dmBCjTJeccFQRNBTvbsiaPG0K80zdatddLIsAxtxBshOqqT7vI93rels7Vv1rl2d5jaZz6AfQ4tgZLqpfzR09czhHUe5KJ24WuPKriS01JXp0QN3TXyFOtPozrvaQlgxgGi91WjpsmXdZ5sWjKY+Ve8/9iVfd1yZhr35NuPZvdatL9iOqqb+uiiNufWdXHbRUWP6O6JG3cdT/jR1iSIv4M1rwkirOJXnV9WEWx1tYDMcMyXjNVfYm7vxfHuojXjFlf4snnN5CvU7oJu+uauaWrvHtGrznd869BjHLxgd/nyLZda3imUuaeO5u7LQL7ht8mfwIAAP//AQAA//+5cMHHlwUAAA==" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 23f5896e7f..9f2b7a9e10 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: compress.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content index 5abc2979aa..fa44a78fb1 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: compress.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index 805c5c6d57..9227efca51 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info packages: @@ -268,7 +267,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tK1gji+TMJpHZThcFvyN1svaTI7Iwah9A20hhA+uuaI= +NodeupConfigHash: p8abZQaJFQyxydESM2UGhBTRujrJTUZb2Xg52drkMjI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data index 94458e2fc5..32e7af4671 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info packages: @@ -196,7 +195,7 @@ ConfigServer: server: https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: cbCj1NRKl3gJFs6sTHbny6W6ec2Sm0liay1G1BNjYkk= +NodeupConfigHash: OBQ0alSKSsxSvuftXeZvVrXVRawAfYbQHcfX+A1p3Ek= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 792521ae81..1f22c24a17 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: containerd.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content index 7a3afed44d..e412af83ea 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: containerd.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index cb7a7d857b..75bb7108f4 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: mqLvVmR/vguttKdr36rBfPHFN1curIK8m+nNGC+C/+A= +NodeupConfigHash: UvWyTi+l55g+9/chFu1i3QDhAPuKmPX1bVwGbLNqzeY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data index f9081580ae..a20f16bce8 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2i2EKrPUyRyNTHP4DjtZUIXnmnJtl0rTwS4qAAv6ZvA= +NodeupConfigHash: roa+Ra93T1NhKNdgD/eEmooW+/hYw5Cyutolc6KM7uc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 15e2f229bb..0d506762a1 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: containerd.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content index 124f7ebb90..8be108e474 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: containerd.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data index 885ab43fb2..6217475a89 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: wL20ol6M6DPDo9TznOPsysl2NDgWn4tukE6KtCHG+7g= +NodeupConfigHash: QUPcqT080tFt3NlgdjI9zUdheTG9afSGADrDKrH1j44= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data index c28dc77025..55587eec7d 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.123.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: TEiANszJi4Ss9JnVswxhX1t1bMK6hVylPjQPlHC8jJU= +NodeupConfigHash: pwGBmV61jkeMyhml687u5TZF0V6dIuhU1ZIKoLaCij4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4cb316776f..1cd908cef9 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: 123.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content index 904a926955..531e378d3f 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: 123.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data index 36c09d353b..de79ba74d8 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: docker containerd: configOverride: | disabled_plugins = ["cri"] @@ -277,7 +276,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: sdmNZLDBYqNaRy/uxJqyVR85NAjyNhoUOEJ6im/aTjM= +NodeupConfigHash: gu2gJoBLOFNsB+tl4hi2Xr1IhFBbgm6JG2FomPyALSc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data index 30af39d13b..bc5d3b1121 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: docker containerd: configOverride: | disabled_plugins = ["cri"] @@ -203,7 +202,7 @@ ConfigServer: server: https://kops-controller.internal.docker.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: meqetrvbuU9VK/28lrN0d3NjMzyOU02HM2cpZzylZck= +NodeupConfigHash: r1Fv9g7nMswonEA0D0FYIyu/Oep5d0lm6F0/j2Yp1Gg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index cd947d6996..1e5809bf0d 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -221,6 +221,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: docker.example.com +ContainerRuntime: docker FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content index b6062fde38..f4c50b63d2 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -11,6 +11,7 @@ Assets: - 000000000000000000000000000000000000000000000000000000000000000b@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz CAs: {} ClusterName: docker.example.com +ContainerRuntime: docker Hooks: - null - null diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index 11b7796579..0b4ad9e928 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: dxICUkbvRU78mRLTAJYz57yorG2aV9mTNUqDJBQ7fIo= +NodeupConfigHash: jHmOnlknKZIDGVYteCW5PSsRYvtJx93x/OKwVj64Rto= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index 134fdb6896..b15a3aefe9 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: MjgHckrfcGy+sySAzLfmm6PHX24WIM1k1pzaWsNKVJ8= +NodeupConfigHash: WPmi9p0eLgfnFPwcUDNamL/YgKZCkqqcAOBZ0c2mqB0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index ad8b5e760c..ebf29d27a4 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: LfcjGJyTXuNkA5ae/kqqbTAgn16wG/tGQqU9wG0sz+A= +NodeupConfigHash: ivhNT9FcCxPDhGCYNE6R+Y0ICf77yo9wobkrFs3vMI4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index 352620a31d..26c8c25f80 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.existing-iam.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: J1Y5Ba12aNQkpKURUMrc52Me2OWwreCmrWq85WcmdvE= +NodeupConfigHash: TFNQAB5PfjzBcaTAWMFVScb5ruwHXFiKb1/ymj7gf8g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e0b0b80d4f..2c9e355784 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: existing-iam.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 028378913d..8e9c0ef37b 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: existing-iam.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 0fb2d66477..186ad166ad 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: existing-iam.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content index cf993a474f..be88e0252f 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: existing-iam.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 404c566756..9b7772865f 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: TneL+pQNzzC2622DVZFz1ej/FcBOKCEz8AWR2yLmJzA= +NodeupConfigHash: V4RXcgAAwoZLiZBOXL8IXKvgW9dcVGl1HCVSfT//j64= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index 3b7ed16927..ee01f1ed12 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: 95+BWM6cbYFJY3KBjoPOs5mHDg2OlgIEBfeEKGM1rlo= +NodeupConfigHash: WuiMC6jDy4XLqIOr+pRMdx3i0aGOkP8LeaObDCRooS8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index bb92fe32de..a9c9c6960e 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: ENwoLYL06SZtmjI9i+j/tFVGCmaukStfDgkpdG2QqSQ= +NodeupConfigHash: TxONmDKrGZjZxsRFgxqHlWAJRg6ocbz4iHqM94OBd24= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index fa20a462ae..4d8a020fe6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.existingsg.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: V9vB+Hb8d9wJJQGrfr8Utnuxw8Giiqq5WGTOPTGc6WM= +NodeupConfigHash: Dg1Pt4ozUDGgGu+fcITtll299DxRUNLRjVth+7m/q0c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 975b8016df..f4a5860cc0 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: existingsg.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index e4568c0a29..186f2772f2 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: existingsg.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 1169ac3295..db2f0247f6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: existingsg.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content index 1069b6638f..297002bd3e 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: existingsg.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index d145542fc8..59c0278ef4 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: HespC3YiFlTWW+i5ytJHFOCQrk9OIbXCtx2H3EHpDSU= +NodeupConfigHash: zWoLVLA5zY/w5MLySvodluHwIRmCAKspru4v8gSWybo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data index 24faca32c2..8b8790b4c3 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JPTpr01xOStF8ysLrFeIddn3Em2fa7vCnDqPrHH48IM= +NodeupConfigHash: z8VB/G1H4+VqW7eiejN5ovoP/L9F/z71+9P/4RlTCXw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 587909fd90..7a87fdf37d 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content index 3c5e64001a..25543e9209 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 730c281092..39eda965c6 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oMCMfE1OWGyvcyAxoa3sinKPdfd/Eg//0stpO1T8iUM= +NodeupConfigHash: nNtMxjPThhsud1bMFio8XGBi8WwN7W/Xc/mOhDlf+KI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 24faca32c2..8b8790b4c3 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JPTpr01xOStF8ysLrFeIddn3Em2fa7vCnDqPrHH48IM= +NodeupConfigHash: z8VB/G1H4+VqW7eiejN5ovoP/L9F/z71+9P/4RlTCXw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f6ba1fa68f..a8b96fa85d 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content index 3c5e64001a..25543e9209 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index 80e0346b49..800434e646 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: gxN6L5c+SHCxo6x0bmkoj/ACDb+dGyV8XoJQFWPBZZI= +NodeupConfigHash: tBaERwXr4D/oiIScffnFPrAM/UW2BGBYkPV5aqBqfIM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index 5c7bbbb7d3..175db00e47 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.externallb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: uE2blNS93BjDAc2CjF/9JPfpRq1lAVzmCpBl8vsGetg= +NodeupConfigHash: pskY2+FEHYr8Qto/vooayq2OEOLYS5WrIUkZr1QSDcw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index bfa2b0d620..8caff02f64 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: externallb.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content index 18a8464700..03ce15bdc3 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: externallb.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index 0fdb42d87a..8efef7a00f 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -262,7 +261,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: OJWLx/RlnZZovzOisiNOVAg2HaqlgnT8YBCMcesjxZE= +NodeupConfigHash: P/34jQ99+QxTeeciYbyTOxixZTvvhqB/eVKKCds+7mQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index f291dc6c01..a6bd32a34a 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.externalpolicies.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: NLPUT4vRC2bHfPkqAPO/lUIhqL20rgzWO6Ax9Ym4IMI= +NodeupConfigHash: bgFULSB9EBTOZI/l3Zxhu6WPESQUJOZVy+m1i+ds6HI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 09014fa043..aa6fea3b16 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -225,6 +225,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: externalpolicies.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content index 3c8d952f2b..62f3cd6e6f 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: externalpolicies.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index 72b910f9b5..c28fe9fa0a 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 4js9qiSLS4vkRNrYzmC/ITi5eapzV9iArsK+4tROxe4= +NodeupConfigHash: 8mzTPtc76CP3a8+IvwNMftH5qSc6fW0EkzScRo6O2Dw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index 462df2dd14..cd54a4b5db 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: y0pAbP3yHSloF+v43BS+Zr0AwJTYdIGPHwypK4nBHjg= +NodeupConfigHash: 0gzxA8uB8zFO7XYwXAAGo/RKE+lMYC4g5hQ3BhVfcHU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index 63e1a40fc1..c62ddd5328 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: z/J+qa30HJ/ErGvtOFSPtF8j2g2FwSXfX24RlxpvEHg= +NodeupConfigHash: xLgt97sm0VYQGq6V0VRs8Ml4y6Tp8nvlmzDOf9IWzRE= __EOF_KUBE_ENV 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 index 1b2ea199c7..76199c9f1c 100644 --- 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 @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.ha.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: FtYX8taky7/opneAU/rBWXwkQx0lU4EPIRPofhGzJJw= +NodeupConfigHash: TMCferwbwvPjJw2X4W77hiiIzkDBmLLNDRB3pfB8cOY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9a1fed0623..749e399950 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: ha.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 2683ff092a..559a06f4cd 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: ha.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index edced56a8c..e6f6c2ffa1 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: ha.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content index d9ec73bbe3..5e25a67bb3 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: ha.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 516a76021a..b20902a4b6 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: ha-gce.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content index 8d463eb369..42eb0f25e5 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: ha-gce.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content index ceb13a979b..e8cfcc4fe5 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: ha-gce.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content index b25ea6608d..da7671c54e 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: ha-gce.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index 7cd98d36ad..5b8ee63570 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: MzvV/Q1teBsQocNzS+BeRqVVGP2qXkuzH/bKGRatJUo= +NodeupConfigHash: 7qEAIa/e120MBb+lbSAjeJeMCmEC0sRkpqyT38ai2tU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index 087a9d2b55..b16c0ecb6b 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: ControlPlane -NodeupConfigHash: rFaAanHcJKKPdab9HEcB8msWhNlB05ShisQzoKSexBc= +NodeupConfigHash: JGnOuoyXThEEJyI3VBWpeI+ErjLA0I5/ZewbYkIia3Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index 6aefe73d46..7b94601117 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: ControlPlane -NodeupConfigHash: 5FZwE9iQ+WvBoL5uIHdqQtUS8ysZv6GRfhKAZhIf/HQ= +NodeupConfigHash: 6QcX67drqAkl6f5bjxzb8VxOxHZ9Fzr73YEPGuEu/y4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index 1f6c4182ee..e398a37be2 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.ha-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: FGrVaf6jTUeWDdpxBJs+mvmXVfFEaGzwVTp9pVdb78A= +NodeupConfigHash: DC2N+oA5AQqyJX1AB/tXcGlElAJmSFLKqHKZ28NA9L4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 730c281092..39eda965c6 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oMCMfE1OWGyvcyAxoa3sinKPdfd/Eg//0stpO1T8iUM= +NodeupConfigHash: nNtMxjPThhsud1bMFio8XGBi8WwN7W/Xc/mOhDlf+KI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 24faca32c2..8b8790b4c3 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JPTpr01xOStF8ysLrFeIddn3Em2fa7vCnDqPrHH48IM= +NodeupConfigHash: z8VB/G1H4+VqW7eiejN5ovoP/L9F/z71+9P/4RlTCXw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f6ba1fa68f..a8b96fa85d 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content index 3c5e64001a..25543e9209 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data index 0d40b26f23..631ceccebb 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-default InstanceGroupRole: Node -NodeupConfigHash: q+ueKKYhTLY/2C9Fv8EpmdYH3nYyheKp8jZ/N7ZZDT0= +NodeupConfigHash: BssqoteGF7Qke5cU3Er9O+fQ4Yo7Bn9PvYhUvzM0QTA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data index ba908af5e0..dc4721e7a3 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-single-machinetype InstanceGroupRole: Node -NodeupConfigHash: sqX/a7IVjQVDinaAvDE2gw383AgGXSHo46OkCs2I9jU= +NodeupConfigHash: aAVhUttng7cYlapnYkRxVASaJpap/nbURwkNrUdOB8A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index c81f235e61..ab1ce8eb20 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: a41IvufM0rEXYk05fU/G57aw0niNmh9IbhK57d1QcOk= +NodeupConfigHash: pD9y7+6QonYrXPBOINEDcJ8DRWU4Ipmcxn6hAGMjI4U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data index 218c113946..b8edddf2bd 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: TruUfMSEmOpAr+7nw+5BwO5Tc/qp7AGvTlw2rOyJeOg= +NodeupConfigHash: nvaq0CO4jsoFA6TN5OioexxCF3Y6pGjzJejymSqPwd0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content index 3ad2bded61..2ef990cf56 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content index 203fd250d2..b132614dec 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 28cb83eb11..e3e43c64bb 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content index 0269be8966..cd5e84fdce 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 459e53a42f..454c30a26a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: poTOqrIqqKxbLYO1XZhHYVBU4lBFCPp1o4owX++SgII= +NodeupConfigHash: MzxRH+OEASioISOj33aFu+F/vgWa9Qr1ppSu0sn2tKk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index a12a5415ee..c308a56e3a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Daks/KAPYmKjSobpn3fkBQd7A0KA2845po3xnwkxlzw= +NodeupConfigHash: ABlSllfCG+rsNECHiYY/7DTk2vfEj4xYoQ4pSl+eDWc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b469e731c2..4c750e8ee9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content index 2adf6611e6..9110404b45 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: t2.medium Hooks: - null diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index d460ce49f3..09d0194225 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -262,7 +261,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: TnnTR/wZf2pmN0C4XCV1/fOd6wmDdyn3e4NitTooQUE= +NodeupConfigHash: NopICNtyQjaBiFJDVfRu2mjg6efgnlix1fQV/bb7BMY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data index 9fde81e589..a97aa33eee 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: F+HUpNRyqwKtqdtpiA36k+zIxbES5yi0yhb/c0LWCWM= +NodeupConfigHash: sTLtbpw9kWlBmvt1ePiNM3RAQmn5E2eW+y24OodI0n0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2bfba32727..390c788c6f 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content index 999c88553d..6938d1020a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: t2.medium Hooks: - null diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 3ee0b1e067..0b1161f7b7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: msckunVeews+88zCeinV8LLwAfRl+mAa94DFiqZopDI= +NodeupConfigHash: XoZLmeda9eH9hAB3T9eAKIWKcj2XyZRUFPNBfp+EylE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data index 00f589e68f..24ad1310f8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: dCdmXSzA90abQ3fTfhDWkXoRr2+choeX9uo4sUk/OPc= +NodeupConfigHash: Kw0Qdu3QE6wjNkqlbB3UKszCYVQPc0VU8uSJvfFz+s4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5604a4d2da..25375bf4ba 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content index 65ab332937..0465f7e1d5 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: t2.medium Hooks: - null diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e54bccd21b..6d591733de 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 9NbPKDXVfulN9baiUDiwV98C9/YlRGxKMfXWTG6i1iA= +NodeupConfigHash: cQA4EoQZFG3qSLMJ+xofLNJrXWk3rogJuIJV1330Y4w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data index 30dcc0d4a3..8dd4a13817 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: uZ4JvhvPjjzyaGOQyofhsIMKk/TLD6nGk8ncRXH5HLk= +NodeupConfigHash: WQwqcWolNVsw3AodEFt72tPsv1VzZZ3yrEHXTb30Kuk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 86555b7267..f5c9b30ec2 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content index 947867f563..ab4d4d5fe6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: t2.medium Hooks: - null diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2c99987f12..db7f59cf23 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: g9+bX1jV2ku+DZ4KFstDA6YwxvBJnAzwxclXNoYoLmc= +NodeupConfigHash: dufYElcqCNgtbZ6VVax6DfsRvgglS5aOv1jg4plY5uI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data index 52ca3ba787..0d8a209bea 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: uHznXRp7KoAmyuocxQozIURmfpy8+nWmjhX8ZL33kSw= +NodeupConfigHash: rMVj3T+6SUgAkV6ncG4NDfu+wajgOog8l990fyDkphk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9fc0005e2a..33d3d67f85 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content index 053e583037..47dd99d25b 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: t2.medium Hooks: - null diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2687aa5555..7924d4afcb 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: KoG5OBKM4SSPJogZzOjJt79zIagv+kVnpippTmxcClM= +NodeupConfigHash: 1tUJ3SV04/pM8W/HmLu94d+0Lmo1Rikg5d1fNcUtw4g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index a12a5415ee..c308a56e3a 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Daks/KAPYmKjSobpn3fkBQd7A0KA2845po3xnwkxlzw= +NodeupConfigHash: ABlSllfCG+rsNECHiYY/7DTk2vfEj4xYoQ4pSl+eDWc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0f27bd2775..278a95b7a7 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content index 2adf6611e6..9110404b45 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: t2.medium Hooks: - null diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 9ccf280cc8..984545a5fa 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content index 0cebf62452..9eceb23eba 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script index 23c63deb89..38e92a711c 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -251,7 +250,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: RwzbBO8vFfohm3hZR0hWuE39dYZhotGcIQar693qoAo= +NodeupConfigHash: /lUfHx4WzOQvAx6A6EZSWpUzgF1nniZ/CYZcxSlsWqo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script index 715b5ca400..86e0be5843 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: uuWKGS8qnPDNHdeIN6pvZUYtr+YLVelXi8Y1rdEgrXw= +NodeupConfigHash: xpyTpNiYY9OZTyWfxmOyDRXBYx07JuMzLFamTXopyfo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2687aa5555..7924d4afcb 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: KoG5OBKM4SSPJogZzOjJt79zIagv+kVnpippTmxcClM= +NodeupConfigHash: 1tUJ3SV04/pM8W/HmLu94d+0Lmo1Rikg5d1fNcUtw4g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index a12a5415ee..c308a56e3a 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Daks/KAPYmKjSobpn3fkBQd7A0KA2845po3xnwkxlzw= +NodeupConfigHash: ABlSllfCG+rsNECHiYY/7DTk2vfEj4xYoQ4pSl+eDWc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 0f27bd2775..278a95b7a7 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content index 2adf6611e6..9110404b45 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd DefaultMachineType: t2.medium Hooks: - null diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index aa4e9c1e9a..7608eddde0 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -267,7 +266,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: n9+w5xoUgACXVMv8FrAnEAAXUG6p9pj6QJtmSxTDS9Q= +NodeupConfigHash: U5Drj73O+RnpRa79ER8qp/ewzKGF6z5l0jSZsXGNKsM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data index b4c1024cd5..41e3e8846c 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -189,7 +188,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: nAsm9IKnwthqcvEdYpMzEMt5f1+hD8PyWp/DwNDz2aI= +NodeupConfigHash: CMiTLmhsyn1LC8ZUMKUYunEhM6Qjp+y2q+42hFwFufQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 1671f272b8..08ee502806 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content index 87190b804e..77da42d924 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 8942dd90ba..d92eeae5d2 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -264,7 +263,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: xGNscasdgkezjOVhh3H4DxFN0OmhT9hQ8Hf22DRGhFM= +NodeupConfigHash: 8fkgxdMOqG1lJRTuXUPQYyjPJT9pH3M6yemEGqCVQN4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data index bafad7543b..2e3e539023 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: L5Bhl14PXl1lRgKx7NIn9hwmgvfoSlgePRY3fkNOGqM= +NodeupConfigHash: Epyhv8N4ttAAGQG+x4TPFzNbrau7jSKKOrsRRs9nxKQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 03435ca7c2..6cff207186 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content index 8018938355..f27db84135 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index a1b6da279c..681cf8bc4c 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -264,7 +263,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tA04PbnS37cYTI0ExFLgP/IW9wewY5RHrbpcyd+IUv4= +NodeupConfigHash: JHH3DeyKnXoVDea2zR7Qmer7Wk5qAj/O8VfTyTvvlTQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data index 1819c35712..93b001ce0a 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: zRH5lbCL53K6gyeaUGlSgdN65LewgOO7NMOxCELfAr8= +NodeupConfigHash: lof9AYXXIDpn4kP3dELXpOWKr/Dr9c2bRsGO0N47640= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f0bd83228c..40c63a24bb 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content index 736355d6a3..51dc0525be 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 47ac341050..4a23a33a99 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -264,7 +263,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: RORI6JjpOty+ujB4gjVO3/tACSsewplNfIYMvdyttVw= +NodeupConfigHash: srluFfhjA3d8G1wYSIsXovprAlNy93ynq2QBEqux0dI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data index b3c2dca3e3..3394de2d66 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: XJtTRJ29cwcimxpwNxq6So1KaK3zZtFW9OHZbRlQ+l4= +NodeupConfigHash: xd4G0RB1bTO6RPNF91q9qPdJeS7capQFE5LFo+Rlcqc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 576cf462f0..7f995a146c 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content index 5394e1e21a..0d6611048d 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 47ac341050..4a23a33a99 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -264,7 +263,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: RORI6JjpOty+ujB4gjVO3/tACSsewplNfIYMvdyttVw= +NodeupConfigHash: srluFfhjA3d8G1wYSIsXovprAlNy93ynq2QBEqux0dI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data index 64dda58744..ee4285972d 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: XJtTRJ29cwcimxpwNxq6So1KaK3zZtFW9OHZbRlQ+l4= +NodeupConfigHash: xd4G0RB1bTO6RPNF91q9qPdJeS7capQFE5LFo+Rlcqc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 576cf462f0..7f995a146c 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content index 5394e1e21a..0d6611048d 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data index a4dde1fd81..b675c3ef56 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -276,7 +275,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 4eHwZmNydEIBSI/EBC7z9+fsLXj+5Csr7k+YeOr/MPw= +NodeupConfigHash: oD06GK6PGj1DLiMMn9Mreh9oUP8uAak1tZ+l1mbt4sk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data index 059e246561..7c23bb83fa 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-etcd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: KKJvQWuBHEn7XnLjB3+Jq9wSVnHALRYw1zgxax3h+BE= +NodeupConfigHash: FoY5colAZY2S+AsyB6Zpfv26sru8EwuJtiKQq//OMEg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index fce036f4de..66abf5751c 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-etcd.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content index f9a6cfaed3..d05256b175 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-etcd.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 72bc61c918..22980f2d07 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -266,7 +265,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: HespC3YiFlTWW+i5ytJHFOCQrk9OIbXCtx2H3EHpDSU= +NodeupConfigHash: zWoLVLA5zY/w5MLySvodluHwIRmCAKspru4v8gSWybo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index 24faca32c2..8b8790b4c3 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JPTpr01xOStF8ysLrFeIddn3Em2fa7vCnDqPrHH48IM= +NodeupConfigHash: z8VB/G1H4+VqW7eiejN5ovoP/L9F/z71+9P/4RlTCXw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 587909fd90..7a87fdf37d 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content index 3c5e64001a..25543e9209 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 101df5036a..daeb19d9b3 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -261,7 +260,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LqCl+CWurpKhh4iS66VdDvtnZMHpaIgkzD1urnqbeH4= +NodeupConfigHash: jHjJSJUIThuYqA+po1TJZMrLt8K0WKEj9oJ7ALbtmoM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 6f60f22a30..b68d4dcc55 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2Nh9bgoMT4h1VmBlyvPtik9GVydqzUwnWLhHK8mnIYY= +NodeupConfigHash: B0XdxdGzsV8sBDpGBr6zGiEphIzxQzBvKwQvOOl5OE4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 241a71a4e9..96db0ddefb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content index 40603e2a05..d56a62aba0 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 101df5036a..daeb19d9b3 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -261,7 +260,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LqCl+CWurpKhh4iS66VdDvtnZMHpaIgkzD1urnqbeH4= +NodeupConfigHash: jHjJSJUIThuYqA+po1TJZMrLt8K0WKEj9oJ7ALbtmoM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 6f60f22a30..b68d4dcc55 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2Nh9bgoMT4h1VmBlyvPtik9GVydqzUwnWLhHK8mnIYY= +NodeupConfigHash: B0XdxdGzsV8sBDpGBr6zGiEphIzxQzBvKwQvOOl5OE4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 241a71a4e9..96db0ddefb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content index 40603e2a05..d56a62aba0 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 101df5036a..daeb19d9b3 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -261,7 +260,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LqCl+CWurpKhh4iS66VdDvtnZMHpaIgkzD1urnqbeH4= +NodeupConfigHash: jHjJSJUIThuYqA+po1TJZMrLt8K0WKEj9oJ7ALbtmoM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 6f60f22a30..b68d4dcc55 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2Nh9bgoMT4h1VmBlyvPtik9GVydqzUwnWLhHK8mnIYY= +NodeupConfigHash: B0XdxdGzsV8sBDpGBr6zGiEphIzxQzBvKwQvOOl5OE4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 241a71a4e9..96db0ddefb 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content index 40603e2a05..d56a62aba0 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 101df5036a..daeb19d9b3 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -261,7 +260,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LqCl+CWurpKhh4iS66VdDvtnZMHpaIgkzD1urnqbeH4= +NodeupConfigHash: jHjJSJUIThuYqA+po1TJZMrLt8K0WKEj9oJ7ALbtmoM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 6f60f22a30..b68d4dcc55 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2Nh9bgoMT4h1VmBlyvPtik9GVydqzUwnWLhHK8mnIYY= +NodeupConfigHash: B0XdxdGzsV8sBDpGBr6zGiEphIzxQzBvKwQvOOl5OE4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 241a71a4e9..96db0ddefb 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content index 40603e2a05..d56a62aba0 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index f4b7a0f5e3..e869e1c782 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -258,7 +257,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: YRmFnIiGXXyXW2PU7mQkjwUYTBoKMNnvgXG+/wTddwc= +NodeupConfigHash: ZowIBvbPuFKe/i9lYJnGJ529UIGKbcy4uByz0HTV0gQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 091e494f46..36b194fa53 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: R9/Gi7OENCx85AFxPUYgF9YvIFW4ilOuFG9Gi0PJn+s= +NodeupConfigHash: lDUelIJh4cxfEou+l6EHD9fPO8y5+bu8UBSpe7n8Pas= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 7883e50abc..b4ba8b7623 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content index 1732390971..2f6f2c0e4e 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 3886662c7e..3e14f84c9f 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6wCze3437gVHE3cl3aYwAVFTgqJx44bFj8wdknXeUWQ= +NodeupConfigHash: XWPYm3kBjCR/O6vRb/WOLzOun/O3avM7DPwZk+k9pAo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index 72b8e0fba2..dca6e0af87 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-warmpool.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: YvHInFKSF3AqhyCBPEl6iUIC8YGs1IXv+Sb3p3lNAx4= +NodeupConfigHash: a5A8Zvm6IYz1SR+KHpbPD+QtrkF4OYxTxZbFW22nqhE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 28fb4b38be..6194946fa9 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-warmpool.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content index 2b638d388d..3b745708e8 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-warmpool.example.com +ContainerRuntime: containerd EnableLifecycleHook: true Hooks: - null diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 886b349bd9..554d2d77d7 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -258,7 +257,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: MW94ibJykOrtsugxOIOCRFb1S7VNWqCCpl6KIkFCIJ0= +NodeupConfigHash: BvUhYOcSAmMh7tOaybrm15Uai8SUw0GNffOjstE6cZg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index 2b4af38685..4e38277fa4 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: KLfWZ53gDqZVM6ZuqiyxIgAnL3kjJsBMmWy1dbtJ378= +NodeupConfigHash: dHOE2BIcaNiT4eHIWgHl+FyCcjfZTaZE/jktvsoeRXA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 003032f72c..7eaf246c6c 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content index e9aaeb1524..7fc43171de 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index abec789841..abfb18c7d1 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-gce.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content index 51a20c7040..9817099b58 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-gce.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index d5fc8d2841..9585bc6e4b 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: GUQpZnxMgRl0m0RZpfcB6hQWhKLl51DB4Q2j4ylEUS8= +NodeupConfigHash: AfpAFhEQ3aJIDAUxPeMD1K875ykhgCMIBPwszqB9jB8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 5372d7a843..cc8e488bc1 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 1PfH9XJirFGvLk24GXAV4P5ttXhJ/nNsDNzkBLXQydI= +NodeupConfigHash: rrIh02a6aczLParOgN9om3VwRv3MtcOrQYe0sLMtxaw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index abec789841..abfb18c7d1 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-gce.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content index 51a20c7040..9817099b58 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-gce.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index d5fc8d2841..9585bc6e4b 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: GUQpZnxMgRl0m0RZpfcB6hQWhKLl51DB4Q2j4ylEUS8= +NodeupConfigHash: AfpAFhEQ3aJIDAUxPeMD1K875ykhgCMIBPwszqB9jB8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 588313c1ce..0414c21929 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 1PfH9XJirFGvLk24GXAV4P5ttXhJ/nNsDNzkBLXQydI= +NodeupConfigHash: rrIh02a6aczLParOgN9om3VwRv3MtcOrQYe0sLMtxaw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 0b09307af6..3a71538250 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-gce-ilb.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content index 4b6372e1dd..d0df847455 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-gce-ilb.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script index d9d73cc27b..bdce289f80 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-ilb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: avkO5FdJyPy9UtQ7qp/LMs7eKsAvudVTrHEz6MWzwCM= +NodeupConfigHash: BcspjanpoTwSFDDQyyt0uWoNcVzWJIFSb7EB48GZEUg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script index 298bff0a5e..4268f30a34 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-ilb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A/M4DEPV/apaX5qvjXjOQqpPimWLuO+cFviAk/YSqb8= +NodeupConfigHash: 55rCNkIMBQ5PreS6WAOvuMElJK1IgOlUO0YJv2+H270= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index b0aa76453d..1935167d06 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index a4a33d6aaf..87341f6b91 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index adbd291420..a9a8245fc7 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: JmCG7eeNTfTAr7D36TheD5QoATal67OUI0hnfm+rPps= +NodeupConfigHash: BNiBiUX0pESVZyx5RoYwdrqFLd6MqBViW9IWXlkZsVk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 05786c0af0..c224e1bce5 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: hS9DIjv/IHzzeGUQh+YybjSbp8f/MZy40cBi5b+jAcE= +NodeupConfigHash: T4WeGMDFTqJTj9IFjAbzYmQklnAe+kqLJkjiqiibDAc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index b0aa76453d..1935167d06 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index a4a33d6aaf..87341f6b91 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index adbd291420..a9a8245fc7 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: JmCG7eeNTfTAr7D36TheD5QoATal67OUI0hnfm+rPps= +NodeupConfigHash: BNiBiUX0pESVZyx5RoYwdrqFLd6MqBViW9IWXlkZsVk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index 05786c0af0..c224e1bce5 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: hS9DIjv/IHzzeGUQh+YybjSbp8f/MZy40cBi5b+jAcE= +NodeupConfigHash: T4WeGMDFTqJTj9IFjAbzYmQklnAe+kqLJkjiqiibDAc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 954a977715..fcdeef5c70 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -222,6 +222,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-gce-private.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content index 8a4593bdf0..833d93be51 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content @@ -15,6 +15,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-gce-private.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 2faa5ab7cc..9c5fd384a2 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -250,7 +249,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: KJekz8CfBi+4tWNDPL9O4rRC5mQ9v4FZLaNmzTs1JL0= +NodeupConfigHash: dQ/1QiEp7xrBZjwmmIEeagDYwWmN4Z9QoTSvJP7UZlg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index 90be245efa..c64ecca6df 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -185,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-private.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: f6fccSaVp2dxQWfoi4VRE6TCebRiicnZ956s7i/vAmY= +NodeupConfigHash: qvN1bAQ8PIDGdFkLV2j1G5ZTRoJC/toyG/IlygnIv9w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 782e5e063e..dee2f6f855 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: u/25OeRPthsws67hO6vZ+mbivmdtRUfMezs0hLPrYHk= +NodeupConfigHash: xyGFoJRETOK7uapVCNvlnBGqmSjBqhf+KqXMiVkazeY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data index 6fc69eac3c..33118ae919 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.k8s.local:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: r3U0uFxVzRrdMXKxXwYqUuc08mec5IOpfDhOuJN5F7o= +NodeupConfigHash: NWiOrO7M01Iig/yYVEbe9AmAZCy25/6M3RgobJqci6Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 45f7ab9bac..e79c42a7a7 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.k8s.local +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content index 728a06673e..377601fb48 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content @@ -17,6 +17,7 @@ Assets: - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: {} ClusterName: minimal.k8s.local +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 6304e3b79d..75ebdf43c1 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: zv4719pLxFkI8I4ZNOb4rUMCsQj9DTSniHKDByHC3cg= +NodeupConfigHash: 5jJ1SZAa8rMlvMI3pAHmEdU5lNZtlW9o39JZlND8HwU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data index 6fc69eac3c..33118ae919 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.k8s.local:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: r3U0uFxVzRrdMXKxXwYqUuc08mec5IOpfDhOuJN5F7o= +NodeupConfigHash: NWiOrO7M01Iig/yYVEbe9AmAZCy25/6M3RgobJqci6Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8ef9f0cec9..402a0c9811 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.k8s.local +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content index 728a06673e..377601fb48 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -17,6 +17,7 @@ Assets: - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 CAs: {} ClusterName: minimal.k8s.local +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content index 08a8a636d9..457351b200 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content @@ -220,6 +220,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content index 19da5f1580..3c81d0ce6b 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data index 6ce19c3a79..6149d43dc4 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -249,7 +248,7 @@ CloudProvider: hetzner ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-fsn1 InstanceGroupRole: ControlPlane -NodeupConfigHash: VzEpCIIuBj/hrDXu1gyGmj0RTGYIqmQI/BREL8z3Wlo= +NodeupConfigHash: Rca4D+V3FgTk3YL6O78DZX4c2jaH0L+i81G/4h8atdE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data index 4a9966f31a..f4b723458f 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data @@ -124,7 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -184,7 +183,7 @@ ConfigServer: server: https://:3988/ InstanceGroupName: nodes-fsn1 InstanceGroupRole: Node -NodeupConfigHash: C+TUaqpmvTVtheQzm/JphZecCWlrKG4++uxuSwYKEtk= +NodeupConfigHash: woRJHkRnwOmUT38W5eaSewQ4VEZB6q84ReNBvmJx5Mg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index d1e9637c27..40b53107a0 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: VeURMIF5RgxAYw/8Ddw2lYbyKN8kt6yOk9ZP2T+14hE= +NodeupConfigHash: nzhR3u+moRYd/AXn6Gwi08Cd4xXkad/Y7ngeZDcLpuA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 1f7d14e232..092c5b6a5f 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: GRZzzrmVvQk4wvcCeDiD6Vu3o777MGhdBqZ0tiZRGJA= +NodeupConfigHash: iRLJ7wTUAhDh8A61tm086u0gUtNYows3DwWvs1Vbl7g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 9d1c0499e8..d194715437 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: lO+0O9i7ATIYAgDN38hUCKlOI84h98AoSmJJTlUauPM= +NodeupConfigHash: RdE0Lk9tMNChg/s7dA5sjkl2KJDypLId7SvCJyBiUhg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index f9e340fc78..dbdc6ab651 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: VBIFXI2ZbZxzSABWZiOa90t/v1FbgbPs7YD3QexVGSE= +NodeupConfigHash: 5Xm/HJAklBP/Cawb3JPPvXM6QCcO9i3dAgamG5Bpc60= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d5835ae0d9..d65eb5dceb 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: mixedinstances.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index eff54f2595..4210feb401 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: mixedinstances.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 545803f7bc..f5137ed161 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: mixedinstances.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content index a6b7c29389..9afe30185b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: mixedinstances.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index d1e9637c27..40b53107a0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: VeURMIF5RgxAYw/8Ddw2lYbyKN8kt6yOk9ZP2T+14hE= +NodeupConfigHash: nzhR3u+moRYd/AXn6Gwi08Cd4xXkad/Y7ngeZDcLpuA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 1f7d14e232..092c5b6a5f 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: GRZzzrmVvQk4wvcCeDiD6Vu3o777MGhdBqZ0tiZRGJA= +NodeupConfigHash: iRLJ7wTUAhDh8A61tm086u0gUtNYows3DwWvs1Vbl7g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 9d1c0499e8..d194715437 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: lO+0O9i7ATIYAgDN38hUCKlOI84h98AoSmJJTlUauPM= +NodeupConfigHash: RdE0Lk9tMNChg/s7dA5sjkl2KJDypLId7SvCJyBiUhg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index f9e340fc78..dbdc6ab651 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: VBIFXI2ZbZxzSABWZiOa90t/v1FbgbPs7YD3QexVGSE= +NodeupConfigHash: 5Xm/HJAklBP/Cawb3JPPvXM6QCcO9i3dAgamG5Bpc60= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d5835ae0d9..d65eb5dceb 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: mixedinstances.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index eff54f2595..4210feb401 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: mixedinstances.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 545803f7bc..f5137ed161 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: mixedinstances.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content index a6b7c29389..9afe30185b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: mixedinstances.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index ab442702ce..dc9fb8e905 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 9kUhmGYdWeptrtKgvWd5I+u4uxa3dl40+NjHAqSgp+c= +NodeupConfigHash: 8uyAqgTzNQvlni0ipV0i/4emdsyn/ckhP//fkDGgfCU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index 0eec98273a..fcddced8b1 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: TK0WpktiNhvqhkTk2j9sQqPmjolFJRmOWoDTsrlRENI= +NodeupConfigHash: x7QAARJRiw+r78LPq4ZrHwkMZ1r5NJ/D5o8ctCIt9Pk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8017035e97..a34113aade 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: nthimdsprocessor.longclustername.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content index f9fb0b3b40..b421aa9079 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: nthimdsprocessor.longclustername.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index feea48794d..f291ed71c2 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: MdnjFPgmUwRJqmMgUJKpo7WSJP7fsfsMsDp5/fOapLM= +NodeupConfigHash: B5gJvXZZDa5qak7z0TAsQGlqhliJhjtrkBAdCBccaMA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index 0eec98273a..fcddced8b1 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: TK0WpktiNhvqhkTk2j9sQqPmjolFJRmOWoDTsrlRENI= +NodeupConfigHash: x7QAARJRiw+r78LPq4ZrHwkMZ1r5NJ/D5o8ctCIt9Pk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index bf2c0a9e54..eb70edd2a1 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: nthimdsprocessor.longclustername.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content index f9fb0b3b40..b421aa9079 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: nthimdsprocessor.longclustername.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 397eb71967..3e636b983a 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info nvidiaGPU: @@ -263,7 +262,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oBV6wHRZ8is+wYEVjHv5dIZyorscep694en1HBf/NIY= +NodeupConfigHash: ATO+18LLTYsx7gLkyszoxqrROFl4lAmd9VCSgd/nbPY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data index 99cd9d8c57..eed9f82d20 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info nvidiaGPU: @@ -191,7 +190,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: gvLpWOyXZhH0Mm3sgJeG0e4s6eTtyY7KnM/eDd7UIXI= +NodeupConfigHash: xVW3txAr8em/+fyp4qPTSZulsXs6iQkee5+pDk46k2o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 015a5555a7..d68c1d7c6b 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content index 47d5a94346..232a729b46 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index ba6ced8c6a..be53396f24 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: WgrX5NeQIb5kEQHytBoCl6KQtn005yux/1+Xxt7ACf4= +NodeupConfigHash: 4xUCprZw89Vf38b14Uo9/lMIDsVIKA53IXHLNJyEjwk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index a8883dc0b3..947a30996e 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.private-shared-ip.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: AGmNoWAChptT3q0gz+6G8brjumBEll4ZUZoWnto8Sl0= +NodeupConfigHash: OuvwVJSe6adiiILZ3BlGQr2+nWXMtyUi/ocpzCHG/1w= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f549d26f66..835f4c9dc8 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: private-shared-ip.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content index fb294627d4..17a3201041 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: private-shared-ip.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index a6a091e784..588a1ce9e6 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: EQpMzclVOrbSd+XGL/KC/GupJQ6GiQlEqVWSwgMeQWA= +NodeupConfigHash: wwyXJS6wwmQE6ZRqxclF3NInuwMVwOTkmjooq4Wx3PA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index 06d9822c48..191b3a4b62 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.private-shared-subnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: r+4DaG6FhQ+yNiiN4Gh1a2gq37z9U74OXfzKPP+hUzc= +NodeupConfigHash: p2T4Ett2yrrMj5l+/iaWzx/S6LtjfbcSaumLw4YQCoU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 45be66f419..0c4a5dbb59 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: private-shared-subnet.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content index ecace0423b..4b7291723f 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: private-shared-subnet.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index 0460a30427..8a1f3939db 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: FEFT93mik+vDqZ4+g6yQXBlroEg4YD4n9Axs48S/D24= +NodeupConfigHash: KDgKKK/+Zvo4vwUCRkd99z3SLh9zyo1WLXjuo5cgAYA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index a2158ac6b1..4eca4bd718 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privatecalico.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: OmhvdtWCbTC0dLTH6MRm4UisUbO69u79qtwJySpacmo= +NodeupConfigHash: oPc6d4DiAuAq0UKi/9Ka0e0avqEAWwotQcYj3z1/UoI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c3a666cfb5..4540dc38f7 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatecalico.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content index 4419e9306f..03c15ad33d 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privatecalico.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index ee75c556cc..182eb01457 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 5ov3/jAk0+qSQBUd4sY2GPnh74wXU19/TKVZbR8o3DE= +NodeupConfigHash: ndbe7nPPuJFvSDUGXKbH/flk56Q/UCqCb6KY9PTcEtg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index 9d67510791..a44b507cdc 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privatecanal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: xrmbP7HuLJX8ZmA/6jsKkoUNgZ+aTY+FK8JmcnGWWIw= +NodeupConfigHash: /Cjw9ZHadaAZj49RiY/R9OyeHstQMm8VHQMGkduhqD0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index eaa5dc4aa7..8aa997ffa4 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatecanal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content index d31a5f5e82..1e58d1f4b8 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privatecanal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 34885333f5..d07c730cb9 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: O1paYOfBKgQf8ucYYhG3zpNsjsZS+YXYOXgZXE6De+I= +NodeupConfigHash: qjZcd6asXwt1afbuS/CbxjE/P8HpavVwde+hXWyxB70= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 5a0cb03464..43878a0a1f 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: QmBuwOkwFQidVczh+/RYOTRmEDUE7R1pwkGmvqxuLSQ= +NodeupConfigHash: 6T6juEcTMasfGUcgpQu/pUZYvUmGQspcPaGCCw7ND/M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b52db70d8d..7b28066b37 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatecilium.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content index 624a5b67d3..d2d8528a9e 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privatecilium.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 34885333f5..d07c730cb9 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: O1paYOfBKgQf8ucYYhG3zpNsjsZS+YXYOXgZXE6De+I= +NodeupConfigHash: qjZcd6asXwt1afbuS/CbxjE/P8HpavVwde+hXWyxB70= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 5a0cb03464..43878a0a1f 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: QmBuwOkwFQidVczh+/RYOTRmEDUE7R1pwkGmvqxuLSQ= +NodeupConfigHash: 6T6juEcTMasfGUcgpQu/pUZYvUmGQspcPaGCCw7ND/M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b52db70d8d..7b28066b37 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatecilium.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content index 624a5b67d3..d2d8528a9e 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privatecilium.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 8f864c9a18..850db8ea6c 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: MMD9MLDsrew70vTUDNVPSiXXox+WywxRSm/Qd7VMQww= +NodeupConfigHash: nVaI/335J7bUqdXJDnv9ImN+B08m7rCXh7cBYk7+RQs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 8c7889c6eb..539a69b519 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PsSoQ8D6beXoKzTEEaymv8DyIwTNtvFyKqHeUVpt2wo= +NodeupConfigHash: GGjhc/3gh1iYWZS2qmlY2s/4C7G7aE0dD7o+bmcZas4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4b8bfaf473..d87a2f5f58 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatecilium.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content index 8c05f2ed23..257b32d10e 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privatecilium.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index 70074d7905..626b8bb91f 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -263,7 +262,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 1V8f8ZJeXEqpu4twO10s0AHBflB/E6jW5EZEPX3+nGM= +NodeupConfigHash: l5dnTBI0spZPDzxNYw/2/iqErGHHRDagYLOhiyumZC4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index 874841c227..11a62cc5e7 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -189,7 +188,7 @@ ConfigServer: server: https://kops-controller.internal.privateciliumadvanced.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: exOyXzL1CwsZ6vP4Lp7Iv/dmMSXQM92xqFeRnAG94/A= +NodeupConfigHash: mDtHnrURqRsqAC+mSUSZiIhd0mcEHBdeUlZLqprsbM4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 30aed6694f..59470c6b31 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -290,6 +290,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privateciliumadvanced.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content index 08689f8402..60a4d8f63e 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content @@ -36,6 +36,7 @@ CAs: MQNfAQ== -----END CERTIFICATE----- ClusterName: privateciliumadvanced.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 48e608b952..9a7ca0d61b 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info version: 1.4.13 @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: hCSw04MOAT3ww+gqaU2WAO7BGCrto5cepOSQRVYMhFE= +NodeupConfigHash: 67M4Wy9+Z+Dz1M+pUrKnHRoGkBKKFkW7bMDILyMAJfY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index 6cb8800493..babbc00876 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info version: 1.4.13 @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.privatedns1.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: YMSfbXzJ1t0jKuWwXlB2SMpHPluo66og5fezB5tflGk= +NodeupConfigHash: 8f0O8Gcqvw0CVtdSrMglUCOUl9Pfp/gqGDxhIuKW7LQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c50ebd2db1..410adfd7a6 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -221,6 +221,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatedns1.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content index 9517d8596a..893fef2bc5 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content @@ -11,6 +11,7 @@ Assets: - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz CAs: {} ClusterName: privatedns1.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index fc285e8792..00b474dc99 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ZnOoiAbxt07nDMZzQeb1OprtioZ0VLkxgyVxbk8TtLU= +NodeupConfigHash: l4pWmn+nyU6M5ySxxiFceJdq5MbwOdsMw7b0pnlHuDg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index 0f4cba09fd..43184b56dc 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privatedns2.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: BmBjpTLgw3XGb48tcrz9Ntg71H78/pvGjdwrzY2YekE= +NodeupConfigHash: s7TURgCTgk3M+yjdKE22Trqkz2GE4otxrLyxpIZq9wM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 40afc5968a..54f6be1aef 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatedns2.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content index 3bb7f51317..f9c5eede34 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privatedns2.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index 16ff850a10..1529d40428 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: PFMTBInMGqeAlOz4PzpiAHBbnaTtG9yLKoqjGzdu41Q= +NodeupConfigHash: SIS3Lvddp6v854R7wgsetDrSi/zsIBdkXNAhJoYHDRo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index 7c704de9f8..1afded5b48 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privateflannel.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: AHCRqSC8PhMMkycWE7b6aNdtUyCGsAyaMl4nP8zqQmo= +NodeupConfigHash: MHfndj4orTHHw/KArzNDa0ojeLNn0VxY7eM+92+tw2k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2b4d4b22a9..cc7cbc50e6 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privateflannel.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content index 2ad2acb80f..157251d7b5 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privateflannel.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index c462abdfd6..0a0178d82f 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: lxP3tfKgl1/ncF0CCIBm/GXSbm89CAGGMrhoNmjXRE0= +NodeupConfigHash: fxXoEsPQ71k49LtOwwx5b0MJ+rUdcBBDBfchkQZM9xk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index 50edb9fadd..9a98156ed2 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.privatekopeio.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: aTak9hfUWOw4Y0pnxMhs7H2US6fOfC2rCBe90SW5XVU= +NodeupConfigHash: TRX2QUdFE7zJGKaxU7eYGIhoTVlARzkpROMYx7WtC9Y= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e114e4d9ab..09587558ad 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privatekopeio.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content index d59d0682dc..98c26adc2d 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: privatekopeio.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index d14ecd84ca..e61e2573af 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info version: 1.4.13 @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 035sckKWZApRj9slS/A+0fxHk2FukhyTwB2FPm5aK6g= +NodeupConfigHash: /MZZHHyH8n3bGM7K5YZBRf1hLw1hdZMKG3zyYPAtsno= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index f3f929f9df..4b4df4929b 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info version: 1.4.13 @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.privateweave.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: M81WcdlStFSDLy6FKF9Jd+WziIqgQ7Qo3TDxyq5xgZk= +NodeupConfigHash: ACvMRZz56JtsQKq7ak/JvYNZSMt87Ja2oCDNFDLoIlQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b6e3e8c717..f1740e9c53 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -221,6 +221,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: privateweave.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content index 623af80aef..68dc52f208 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content @@ -11,6 +11,7 @@ Assets: - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz CAs: {} ClusterName: privateweave.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5bdf990188..aa96b85332 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -261,7 +260,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: G13N//zhCpWXlUl4EKwliWLPVRfec1UJt05nAVxVyYg= +NodeupConfigHash: NOiOEvYnqlV2NswtXnug7OEM5m0kgPAqXy0bSVQGkLU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index 444e8cba7a..ad63f35e60 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: iV3l2zAGUfQiHjFfLrIAo0aJ941XCgu0OJFtM+r6DFI= +NodeupConfigHash: 8mxJ65O/B97YorWZN+xe5Gj3jdTYNpXKFcjEIWdiBf8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 85e875cfac..64d22a0f12 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -224,6 +224,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content index 9593cb036e..fdfe73d059 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index be7d70d527..9d30d18fb9 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: sI/gkrqRPlXaHiHULzqbGyMwUW7RWlgsHXMxMbATBLs= +NodeupConfigHash: cI4yuNVrHbUVMzVMcXeZ2qLyQ3GdP+2EJ5VKksHbydE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index 9c52d749ef..0abc3d25ce 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.sharedsubnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: iHeOsqizNcgLZ6ZCnugpaHz2bM2orYet6/IXOaIVXk4= +NodeupConfigHash: Hl+yNnX33hRif3tuRRBD8r3/HqFD69EpcJLOkmamzT8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index bde55e23d6..4c063ecc7a 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: sharedsubnet.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content index 8ca96ffdec..4cb149f7a2 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: sharedsubnet.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index 97474c7b24..dede6b0fd5 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: p+j99wkodFEd0A7BKGCs7Z60vgLV+N7xE5V1qyLw7+o= +NodeupConfigHash: mhDv9SYvT/9WgYfG4Wg+fMrs2tB5qoMycwxMvbd8vlE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index 245f980870..33e11f4008 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.sharedvpc.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: ejnDlP2YfYM6J+RCaosapDY8vgw+eSKIDvMiTGb4vA8= +NodeupConfigHash: sAhqlNHYOjOcZLvHPwNJkc+rf+HdulY2u6z2dCqa0Ao= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 7eee8a89b7..92132bc0ba 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: sharedvpc.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content index 7ac0f6a6f5..331686321b 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: sharedvpc.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 101df5036a..daeb19d9b3 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -261,7 +260,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LqCl+CWurpKhh4iS66VdDvtnZMHpaIgkzD1urnqbeH4= +NodeupConfigHash: jHjJSJUIThuYqA+po1TJZMrLt8K0WKEj9oJ7ALbtmoM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 6f60f22a30..b68d4dcc55 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -187,7 +186,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2Nh9bgoMT4h1VmBlyvPtik9GVydqzUwnWLhHK8mnIYY= +NodeupConfigHash: B0XdxdGzsV8sBDpGBr6zGiEphIzxQzBvKwQvOOl5OE4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 241a71a4e9..96db0ddefb 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content index 40603e2a05..d56a62aba0 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal-ipv6.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index d7c0d32983..3bce19bfc0 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 5HXAkP27r0lyAbutrMMCd7NUMimQghnmMdk1gQrdtYI= +NodeupConfigHash: gQQ8+BN9gK/O7dDufrcGRSoCUplBA4LRIlHqMMJKL1k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index c95c015d5e..a79c397d42 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.unmanaged.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 3ofQp4WDKTSaidEM7UAY1zLhcTGeHBQ3gIdUss0gHOQ= +NodeupConfigHash: oabN/XG+UPjIAiTYCpbm75AB0jAON3leWPw2xBat2yY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 3efb68c7b1..186b8afef0 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: unmanaged.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content index 2d1ed80110..1231f6fa33 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: unmanaged.example.com +ContainerRuntime: containerd Hooks: - null - null diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 730c281092..39eda965c6 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -260,7 +259,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oMCMfE1OWGyvcyAxoa3sinKPdfd/Eg//0stpO1T8iUM= +NodeupConfigHash: nNtMxjPThhsud1bMFio8XGBi8WwN7W/Xc/mOhDlf+KI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index 24faca32c2..8b8790b4c3 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,7 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -containerRuntime: containerd containerd: logLevel: info runc: @@ -188,7 +187,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JPTpr01xOStF8ysLrFeIddn3Em2fa7vCnDqPrHH48IM= +NodeupConfigHash: z8VB/G1H4+VqW7eiejN5ovoP/L9F/z71+9P/4RlTCXw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index f6ba1fa68f..a8b96fa85d 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -223,6 +223,7 @@ CAs: 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- ClusterName: minimal.example.com +ContainerRuntime: containerd FileAssets: - content: | apiVersion: kubescheduler.config.k8s.io/v1beta2 diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content index 3c5e64001a..25543e9209 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content @@ -13,6 +13,7 @@ Assets: - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 CAs: {} ClusterName: minimal.example.com +ContainerRuntime: containerd Hooks: - null - null