diff --git a/nodeup/pkg/model/kube_scheduler.go b/nodeup/pkg/model/kube_scheduler.go index d1ed31208e78b..0eb65d50cb6c1 100644 --- a/nodeup/pkg/model/kube_scheduler.go +++ b/nodeup/pkg/model/kube_scheduler.go @@ -110,7 +110,10 @@ func (b *KubeSchedulerBuilder) Build(c *fi.NodeupModelBuilderContext) error { } else { // We didn't get a kubescheduler configuration; warn as we're aiming to move this to generation in the kops CLI klog.Warningf("using embedded kubescheduler configuration") - config := NewSchedulerConfig("kubescheduler.config.k8s.io/v1beta2") + config := NewSchedulerConfig("kubescheduler.config.k8s.io/v1") + if b.IsKubernetesLT("1.25") { + config = NewSchedulerConfig("kubescheduler.config.k8s.io/v1beta2") + } kubeSchedulerConfig, err := configbuilder.BuildConfigYaml(&kubeScheduler, config) if err != nil { diff --git a/pkg/model/components/kubescheduler/model.go b/pkg/model/components/kubescheduler/model.go index 090c16f7a6238..b92e9a12c6bb1 100644 --- a/pkg/model/components/kubescheduler/model.go +++ b/pkg/model/components/kubescheduler/model.go @@ -87,7 +87,10 @@ func (b *KubeSchedulerBuilder) buildSchedulerConfig() ([]byte, error) { } else { config = &unstructured.Unstructured{} config.SetKind("KubeSchedulerConfiguration") - config.SetAPIVersion("kubescheduler.config.k8s.io/v1beta2") + config.SetAPIVersion("kubescheduler.config.k8s.io/v1") + if b.IsKubernetesLT("1.25") { + config.SetAPIVersion("kubescheduler.config.k8s.io/v1beta2") + } // We need to store the object, because we are often called repeatedly (until we converge) b.AdditionalObjects = append(b.AdditionalObjects, kubemanifest.NewObject(config.Object)) } diff --git a/pkg/model/components/kubescheduler/tests/minimal/static-config.yaml b/pkg/model/components/kubescheduler/tests/minimal/static-config.yaml index fab10d48a6a25..857d49faa764a 100644 --- a/pkg/model/components/kubescheduler/tests/minimal/static-config.yaml +++ b/pkg/model/components/kubescheduler/tests/minimal/static-config.yaml @@ -1,4 +1,4 @@ -apiVersion: kubescheduler.config.k8s.io/v1beta2 +apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 5d253f67922fd..719f1b0ee5dbc 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 @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 35aCjWb0mSVhKnZftX18Png0JOsg246cyjYeHvYnobs= +NodeupConfigHash: 2Z4qBD8eyPrCZBnhcB/vPZPUzh1J+94a7QNh8/mtoyU= __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 7d1c48ee7db2c..5166ee692f420 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 399ae94c17483..17ef2abb615fb 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 @@ -258,7 +258,7 @@ ClusterName: bastionuserdata.example.com ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: zN7YdbWctJ0SLuQKMcXI1gc1eUJC1rL2UTdy7zboEbU= +NodeupConfigHash: eFAmtHzMXHksnHjT4BQx+7n2+Vq84waxF2fToalVaLw= __EOF_KUBE_ENV 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 aae3f6436a3dd..704bbe42b95a1 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 @@ -226,7 +226,7 @@ ClusterName: bastionuserdata.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data index 89edfcab34498..655bfa20b9264 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data @@ -256,7 +256,7 @@ ClusterName: cas-priority-expander-custom.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander-custom.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: tOsHlRQniaW62MPc7mhEEvLvNQiFn4Qop0I/uD3HrgA= +NodeupConfigHash: bjci1VcYXEWnHaXBE87cEEqgpU6g5EamkaQ7ej7sUu4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2ba1514d01bc6..9c96ebab23be7 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -226,7 +226,7 @@ ClusterName: cas-priority-expander-custom.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data index ba2eda1e45be0..f2429909a1d33 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data @@ -256,7 +256,7 @@ ClusterName: cas-priority-expander.example.com ConfigBase: memfs://clusters.example.com/cas-priority-expander.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: JyidGQZri758ByKNjUPkunpOWuTE2o81Ge/eN+RaGj8= +NodeupConfigHash: +unNNHufh+OBbFejOQm5YIlnrEUlCN3rdLnVax8/27I= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b8f9e75202c81..f232d527cc186 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -226,7 +226,7 @@ ClusterName: cas-priority-expander.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 5532fc416c413..7fa6933bda2f4 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 @@ -133,7 +133,7 @@ ensure-install-dir echo "H4sIAAAAAAAA/+xWXW/bNhe+968g+qJ3tWQ3afpW6I1qZ4mW2PXkZNmuApo8lrlQpHZIKvF+/UBSsp00GTYMK3pRFGjM88Xz8ZyHYlI7PtFqLapsQEhNFa1gaTXSCiaSGgMmIxYdDEAx3DZWaNWZE+WkHIBlfCKdsYDGR4AWlA2/+mgYD4SsKLtzTQkWlA8zpVuTkQ+jTguq7Q2HRNEaMnJ6NZnezvJ5fnZa3k7z4vLX20/55OJ6sbwtT69O51fF53nnQkhLpQMfjwdRC2iEVhk5St4l70NpQn1zad25FeSLYgnYxoSolPp+gaIVEirgXe8JoUqrba2dyZ3dZGRNpQniRuSOC1AMQs+HxEdEBRZMYlqWcFhTJ200jddMtFM2I2Mvc3ajUfxBfeEzzSEjubynW5P7NAaErITiOecIxmRklIR/A0ICahaoW8EBMwIPFlBR6cev6EpCzmthfJ0L6SqhutTmtAbTUAaXYg1syyQE8aWohS2pqgDD2WcpGOSM+USDaBqrOMTlofxKS8BQwxKYVjwqZ85SK1S1S+YGVhut74LyZyoFf1k91xxKMBYF82GDrASjHTL4yWlLfamW8djRrr6NtY3J0nT89n3o1Dg7Ho3Gjy0/t4AoeD+tNK7L/551fTsgZA3UOoQzaqFbqsmymIkqlpvfLDPyykPkVdAV6goBYtPzm+W1QqiEX80DK1HTCjISNbhN7v5vEqFTj5shbYSJUGzHyduTMGuvkGAXCGtAhB4OV9umL6JQcfzFIhzPtbF+UcLh9OFAJ3V1CS3IjPjSEH53YOwGKAcMgAMeIBKj0qpCqKjV+NT29MEiPQ8/fVbioXf5ZVhCrS0Mg8Xwqd8ZatdEv6cOQfXU/tr41Gt43sVrB4QYYA5hodFm5Pj4KEgO8VsY43z/+wnTRiSia1jCdN34ZibwQOtGghd8EeHHm4vldVn8gxCpbkAJnrbj9Lf7O7OP2BF1sQjrlpHxaJScHHvEpeOQelywT5TdgeJZAO5RIKmJVha1lICzPXt6smLUgt+WSTEtzZ6urKVsMwX/f+l3kgkJy61iC0CheUbG9cj8JZGwmKoPG/P8cBLzHO+V80DHLzSRhVfKIUz8HaV2foN2xPl194rtujfsH5/9gskIagmBamIyB7JdTx9vjzPwmCgnCNy/YFT2Y/BXL9kGuJNxXl+3aLO7+t/V2hFQ9vIryCq/vlMUnrmI2RoLNd/JS61tRtK/g7bpfHmwFOPRgUaH74f+mHjg79+7KaxcVQlVnVPFpeeKvhBo4wtyTpFnpIZa4zahLRXS+30cj0Yz8UZpDmvzSPy6Fwr/1/yAAB/fvX4T+v2FaS99ZPufzNvPIi7WgvoJpC3FVIpV2g0p3Rt8gdhG80KtkXoqoUIBFs+Dp6HOQHaUnESfGVViDcZ2F4Jl6f4bJ607rSeTBrUFZi+8TnafBvtJ9NV0G+Gbt9OZjbNc36szpAx6ijoKDPWMaoLCCkblQnPj4WIGNfWRL74D9TtQv22g/gkAAP//AQAA///KG9Hm7w0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/2zOwUoDMRDG8XueIveyXUoFJeCladUK1t21IB6n2amuZDIxk6js04vsaaH3/4/vs55L3yT+HnpMRsOPKOuLZEwHIDTaMcWEIkv8BYoel45JWQ7n4X0DgkYT0llMXbtJzcL6ot4HyRAc3icucVoh+LdVkSqj5GoF86hjj0ZbDjmxbzwEVAfuscTpyAPIh9HjqbtbLexV2d4Ivax3qW23oXvNn+Pp6e2xOV5vvtr983q3OLpb9QcAAP//AQAA//+Zz74h9wAAAA==" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/2zOz0oDMRDH8fs+RV5gG0QPJeDFIGvX0haloMfZ7GysTTJxJvHf04vsaaH374ffzwaq44Hp8zQiGwVf0thQpSDvIKJRjmJmFFnhN8QccOUoNpbSdPJ3IGhUxDiJ0drNahHqi3qTpEBy2DHVPK9E+LdtlbaglPYKltETBTTKUipM4RAgYbOjEWuejzyAvBm1rjrcX/9sk9/c9PvpfOxf1t22fAxn++ufh2F/fO/Y98SPr7fNHwAAAP//AQAA//+LZwTq9wAAAA==" | 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 0e06ef7168567..cc86f65ac3de3 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 @@ -226,7 +226,7 @@ ClusterName: compress.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 3924d087d44a4..54ac13f74ab46 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 @@ -258,7 +258,7 @@ ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 256L9+hwdfwPTl0nwxqr5iFqpgOTwb+uAdIR5/lQcuQ= +NodeupConfigHash: Bg5W4ZjFezA9XTrvMXz0BVhcPj92k3FWQ6d1N18v2Ns= __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 fcb35e6db28b3..99fc7985b99c3 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 @@ -226,7 +226,7 @@ ClusterName: containerd.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 21ed18a061690..29c9207cbb461 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 @@ -258,7 +258,7 @@ ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6mkR9LZMitIfWl7uKaKE4uHHpx0ApOf5R+oOuO1TkLo= +NodeupConfigHash: dar3cg3Ret2bEHFRKyU9GYGgNInJsO2g/CpAaW79fjE= __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 adc61e9f2c3c8..b644fedc9c184 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 @@ -226,7 +226,7 @@ ClusterName: containerd.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 98c35f4dbbfa9..90848ba9ef649 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 @@ -258,7 +258,7 @@ ClusterName: 123.example.com ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: r+wq70KsJV4VZxviq5e8FgMyvjMey/m1X65ivrUaACk= +NodeupConfigHash: P7uxdtp6wWX/CzBJcgLXg9mGdLzRIKs9aJhqsRTjE6Y= __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 b79e6e949c272..49cef9ed8973e 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 @@ -226,7 +226,7 @@ ClusterName: 123.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 cc3eb73555418..5a248e32fa6c7 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 @@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: iGRutee6WOLNlEOoczQcT5mYRs3McsNIGOdoNdMNrbs= +NodeupConfigHash: F9w8WSFslfB87WVDHmQhWtE8q9rK+NC2zTzLnNyjoik= __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 dd987f08b80b2..b1493e0089db4 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 @@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: yT1i6G2d/u9kDc9eCQdy1nJKJaynxw1d+JE07i8y2U8= +NodeupConfigHash: 6FR+sCr24N/uIU5tajeebFqtlmeIAWEne0KfztITz98= __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 12ab0a70e8c41..71b47ad18c8c6 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 @@ -266,7 +266,7 @@ ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: QYyLyZhHq1huDasoNrATZpIZDtpBgtP3dLPHk/Muupg= +NodeupConfigHash: u5bgybw4nh66SL5qjlS3vi2cURohgBvzcrwAVi/U2+s= __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 76b15810c0816..a521def3528ed 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 @@ -226,7 +226,7 @@ ClusterName: existing-iam.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 d74883ca8d667..da38f06e9640f 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 @@ -226,7 +226,7 @@ ClusterName: existing-iam.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 16112f9d1eb33..33f506d92b33d 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 @@ -226,7 +226,7 @@ ClusterName: existing-iam.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 16a3659704a60..0e043d91b42e5 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 @@ -266,7 +266,7 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: gEyPb2dN70hdL1q/PEdBzu/x0n9/oO7o4jTzkKgahOw= +NodeupConfigHash: euP6yMrj/ucS+HPiXWYZyw6HVb6kOYQ0PkPnU8xNO54= __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 0bd5cecdada92..c589031499c92 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 @@ -266,7 +266,7 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: 2Ot7i5E5bRko8O/1Vx4p+3vJe5wXuzG2emMwliQXgxE= +NodeupConfigHash: kiN7GtDMyjduGkLcyF/vuPIzyvUkKjrsB0vLvylXIVI= __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 4b6a4864bbf1c..2ccee6c6fb1d2 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 @@ -266,7 +266,7 @@ ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: LvAP2Tg2PXyUysS/tZfXGXuMqigRURG/weFqVsBsTOs= +NodeupConfigHash: t3veEXCl0Mbnc+KQCeiU6Xi814NULK+GvvOf41eMHq4= __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 5d5c82503c994..881ca76233857 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 @@ -226,7 +226,7 @@ ClusterName: existingsg.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 9d5da0e8b419b..c0c9774f7c1ce 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 @@ -226,7 +226,7 @@ ClusterName: existingsg.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 3504f90ce7026..f1dcbc3acc805 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 @@ -226,7 +226,7 @@ ClusterName: existingsg.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 fe31e7c55db9e..2d1e6251397f0 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 @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 5MQoiA0ccSqyh/bGFDC7J1qIjyCgkEhwoUxcMalj6Go= +NodeupConfigHash: 4uVozeRwQyuWaDm9IwSkTzmWnU9a5CjrMfpOn/uEWHM= __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 94dc3f37db4cb..631eb8300b8b8 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 5d253f67922fd..719f1b0ee5dbc 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 @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 35aCjWb0mSVhKnZftX18Png0JOsg246cyjYeHvYnobs= +NodeupConfigHash: 2Z4qBD8eyPrCZBnhcB/vPZPUzh1J+94a7QNh8/mtoyU= __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 7d1c48ee7db2c..5166ee692f420 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 869a73ff0d8f9..028864f45558f 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 @@ -258,7 +258,7 @@ ClusterName: externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: n7O7pbrmw9wYpMF5IVtaso1XEGC8OfU11Uf6xNfEvms= +NodeupConfigHash: WSnr3Xxeva9NmBfKH5y7YN3L9PsI3qRjAirLTzkq4S0= __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 68d43e473cae9..01b3af4c3a9e4 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 @@ -226,7 +226,7 @@ ClusterName: externallb.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 3cf3ce7da1bc7..a0b77b73014cd 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 @@ -260,7 +260,7 @@ ClusterName: externalpolicies.example.com ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: OnzJ6qxUcLMJZW6+XSCo+1CUpLUro4e1MR8POq9cGs8= +NodeupConfigHash: NXkzWFqwul7hrSdvti1D9hRfpQ9AoUT8ygvXVBePZjc= __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 f0e0d38ce412e..a1aaa52a814f4 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 @@ -228,7 +228,7 @@ ClusterName: externalpolicies.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 584bad6588328..4a0797563b54a 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 @@ -266,7 +266,7 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oGx4ctKnQClC6HFuPlKZEICaMruOHsutlKnn6PV86Xc= +NodeupConfigHash: w4k7KOgKeOky61FQq4Ot5IOPbeklsKfWU0tqdTlvqnA= __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 05d62d5565c1e..87363d33b474b 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 @@ -266,7 +266,7 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: payY0++/unsHKlzw6pLtaBTf2SjFN0teki81/I+fIXM= +NodeupConfigHash: 6fSwRjwneaoi9udQhb3qNJLFwGM65fTb2DiZlVC9U/o= __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 befff860d0f5e..10cb2389f68a5 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 @@ -266,7 +266,7 @@ ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: UZKr6ny+OYnZqA2NbqGTjrZ+R1uDJ10XS8JRflVZ9Fk= +NodeupConfigHash: YkjPAL5DRH/U++wgI80Q6FOnJb0heba/PL4o5CCQU6I= __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 276a19b716e1a..6be026c5980e1 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 @@ -226,7 +226,7 @@ ClusterName: ha.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 2328d2731a8fe..33ff3f7b3efe6 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 @@ -226,7 +226,7 @@ ClusterName: ha.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 ef3a5722c8e07..453a093851c72 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 @@ -226,7 +226,7 @@ ClusterName: ha.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 da35ae3f40a21..5168b632dd591 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 @@ -225,7 +225,7 @@ ClusterName: ha-gce.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 c3d7c4fa38838..ef8e82129eb09 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 @@ -225,7 +225,7 @@ ClusterName: ha-gce.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 12a024dfec0ca..ecf6e4388b9a6 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 @@ -225,7 +225,7 @@ ClusterName: ha-gce.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 f81664192e8ac..e3855100f9cfa 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 @@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: v6wDW3TE6RWEygpH/b8s6GMB+xkr3tUYWae+nExTQXM= +NodeupConfigHash: MdXfV7V/o9f/BtNKwu3fmvuBTZ/6vOu4u9O0qHBUEVM= __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 5ce177d67d418..aa8276344fb3c 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 @@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: ControlPlane -NodeupConfigHash: ckgA+ZFNqQmPSCDe9IZK0dqEA3C4gAg7PGSLHx4FKdA= +NodeupConfigHash: iStlZtW0MbLjVVrFU/Pu5LxlNrYFD1AjMpj2AS8DF30= __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 6b8d0fdbab7b8..a145322fcdfad 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 @@ -256,7 +256,7 @@ ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: ControlPlane -NodeupConfigHash: eSXzCxcidk8V73XojNckWyB0D5mvrGi5F8fGKaPokp4= +NodeupConfigHash: JoIHAp+LuOmqKU/dVP6DjK21wHvUzSXmqRvsVQUTHi8= __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 5d253f67922fd..719f1b0ee5dbc 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 @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 35aCjWb0mSVhKnZftX18Png0JOsg246cyjYeHvYnobs= +NodeupConfigHash: 2Z4qBD8eyPrCZBnhcB/vPZPUzh1J+94a7QNh8/mtoyU= __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 7d1c48ee7db2c..5166ee692f420 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 4d17026af390a..c03c05cc9305d 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 @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: L1+x1V29uTG4EJAOFnrmKEGQVS4r/3iI3yPFY4hY128= +NodeupConfigHash: CrQ2Ti1HoCLMULCEbQFur1QWE/HB144DKVrHGAHLWjo= __EOF_KUBE_ENV 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 265361cc471bc..8214b5e9c87aa 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 0843e0648ed95..659095410a562 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 @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: pli53oKt9IO3x3LZ/AXEpG18gnkJAMy6I4YPbFqiA/g= +NodeupConfigHash: ++ttePWzggz3EVMXyi1UfsR5KRuReFHcQZ397/RNRm4= __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 90a97bd7ebbb0..15f2b60f7cf3c 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 @@ -228,7 +228,7 @@ ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 e5dc23495edc2..88cb79e460112 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 @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: jH3AADdw+B0kuM4ByBDn1dbqiJVb0mS8QclKfAeW5eQ= +NodeupConfigHash: 6Ubm9Cy6pKaeRaCUqREEJX8/l2Qm/eDPCKnPNRVoZWc= __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 cf51ad031e4eb..3e04915468efd 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 @@ -228,7 +228,7 @@ ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 1ab1e4f628252..83eff1a58da86 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 @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: P6y0UFt8Fbna5hHUCh+5YWkafSWz/ob3yUvqhD3Iye4= +NodeupConfigHash: GHYj50IRVxWyMBWeH48nZFfHewWjO8iyFcKkJE3goL4= __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 66cd193550e4c..49c52a5f3f055 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 @@ -228,7 +228,7 @@ ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 767b68c9e5b47..bdb68ea5836ba 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 @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: PN/Zh0pTHrWDnKNQngx6xK+SYRxJyt7S0BlmL5TJRz8= +NodeupConfigHash: 2XyZNItxr9hmnGtTWhguiE19YtLEBMnrFaecxs7ygX8= __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 dca6c015cc63a..d743feb397fb7 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 @@ -228,7 +228,7 @@ ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 946876e2fc6a8..bbf0c456f907f 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 58a29d4755240..2d5c04148b9c6 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 @@ -249,7 +249,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: RB4o4zqutCiXI4CfZUF9BxgW5mY4LBOe2GEQnEceeho= +NodeupConfigHash: 429tCFPjbSsyDG627Dr/ZQJ46XtyH+aWE1JOz/IVV0o= __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 767b68c9e5b47..bdb68ea5836ba 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 @@ -259,7 +259,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: PN/Zh0pTHrWDnKNQngx6xK+SYRxJyt7S0BlmL5TJRz8= +NodeupConfigHash: 2XyZNItxr9hmnGtTWhguiE19YtLEBMnrFaecxs7ygX8= __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 dca6c015cc63a..d743feb397fb7 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 @@ -228,7 +228,7 @@ ContainerRuntime: containerd DefaultMachineType: m3.medium FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 9b5fe461d0f00..04285bccd3eff 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 @@ -262,7 +262,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: YcYbbVbHMd9u4KyRwykzBvsxsqTM/PRaOsRyAlUmaes= +NodeupConfigHash: RaFiBjE39ZqechLMQ4Nahm8QlrkOEDwxKIDvZUfOZvc= __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 d019946ca2d6d..cee2fd2948412 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 290dcfefeb5c3..75ef770247a09 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 @@ -262,7 +262,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: lCGggXHJJpjACKzCzjEupiwY8iL4qmErwZ7cOqdm3H8= +NodeupConfigHash: OBBI0NmtKvct9LMjPVsrALLYP6GARqmWyxbAb7OtBAU= __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 79c215df79fde..602e620a5e323 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 290dcfefeb5c3..75ef770247a09 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 @@ -262,7 +262,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: lCGggXHJJpjACKzCzjEupiwY8iL4qmErwZ7cOqdm3H8= +NodeupConfigHash: OBBI0NmtKvct9LMjPVsrALLYP6GARqmWyxbAb7OtBAU= __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 79c215df79fde..602e620a5e323 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 75271c230f76a..7812ddda99026 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 @@ -269,7 +269,7 @@ ClusterName: minimal-etcd.example.com ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: wpqeDZiW/6MG63FqH2LczM9Cr0ZcdkblAkT+WY3BqLE= +NodeupConfigHash: VCO4V6uYaZlMl6rGkD3D1aWuzdQwQwjogV1jM0NyrAI= __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 cfe8dea58298f..aa9235f773be2 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 @@ -226,7 +226,7 @@ ClusterName: minimal-etcd.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 7a6eb965ac1a0..c18adfba0e8d0 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 @@ -264,7 +264,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 5MQoiA0ccSqyh/bGFDC7J1qIjyCgkEhwoUxcMalj6Go= +NodeupConfigHash: 4uVozeRwQyuWaDm9IwSkTzmWnU9a5CjrMfpOn/uEWHM= __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 94dc3f37db4cb..631eb8300b8b8 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 b9e44f7249e55..46832e661ad58 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 @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: wzR57Xn4ZUiA8c1d97BCw0OMauzc4iIdNviZS1kZYPM= +NodeupConfigHash: zRnmcwc2hs33jNJLP9tvAevVI864zhMNRsnomenSnOQ= __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 8369f6f93fe98..104c422297aa7 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 @@ -226,7 +226,7 @@ ClusterName: minimal-ipv6.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 fb9979c1b9c82..77ba8623171a5 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 @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: km1Vjf+Ol6+3XpRx6hMcYbTIjnu4zHkbBVqfqRN1+5Q= +NodeupConfigHash: LPVp3TmnHp+TuFYfxnolkMk73ao3L7PoDxalRH/5qLM= __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 a486639e44331..2e0a416a60af2 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 @@ -226,7 +226,7 @@ ClusterName: minimal-ipv6.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 af63434bb491d..5432250c290b1 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 @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LuQtlKnQZYC8A4b9bT7wEsVCWH0aEHpVhfk4+9cwSJQ= +NodeupConfigHash: dTfjlir8kC1gAJWFBNC234iBZsn4CdSVs8MrhjBhwbs= __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 65a084968e7d8..ca5dd402ea2b2 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 @@ -226,7 +226,7 @@ ClusterName: minimal-ipv6.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 af63434bb491d..5432250c290b1 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 @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LuQtlKnQZYC8A4b9bT7wEsVCWH0aEHpVhfk4+9cwSJQ= +NodeupConfigHash: dTfjlir8kC1gAJWFBNC234iBZsn4CdSVs8MrhjBhwbs= __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 65a084968e7d8..ca5dd402ea2b2 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 @@ -226,7 +226,7 @@ ClusterName: minimal-ipv6.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 e660dd3c33d67..279ebe4e15b43 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 @@ -256,7 +256,7 @@ ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com 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: Fd1O0dGSJ7EGCrwBUwPJp7p8VS2ZWKwAnrFTWqszV5w= +NodeupConfigHash: MGploYVLYQ+f290SCre4dM254qSkoTva2SbxYP7QV1s= __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 1cc88408d9855..063d05da1381b 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 @@ -226,7 +226,7 @@ ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 c2b08eb186f08..9d421e9fb1cff 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 @@ -258,7 +258,7 @@ ClusterName: minimal-warmpool.example.com ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: sDejwrrWdMTLgypIGBuOfOSSKJsYnIJ6ICAthn5N5LE= +NodeupConfigHash: 0bVhwgd5lof9h4n0NaWIPkhJFRZ/LIR5mY6lnXRl+vM= __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 96eb61a6ed34d..e0613ea5c8f79 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 @@ -226,7 +226,7 @@ ClusterName: minimal-warmpool.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 e0a71477aa806..3e12ac97df4ab 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 @@ -251,7 +251,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: E8NBwa4Cdcfk1NB/PEa1FWYYBKY27Fz+Laq+28yWCdE= +NodeupConfigHash: JKu3I4DxQmVagPALTnZ16cTq/2xZ2/R8F5pdAhCLiig= __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 9b325c8dd8868..effcb6de55ba0 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 @@ -227,7 +227,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 b6b09f015e459..88fef40ad8f6e 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 @@ -225,7 +225,7 @@ ClusterName: minimal-gce.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 caa546ddf2be7..8356be9f5e096 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 @@ -248,7 +248,7 @@ ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: LsMefdYQUvV36gmpRwX3T187JNM02XHwrkfG/KCplbo= +NodeupConfigHash: U245k5RGkGDhqqrt0+5/ZO1XeXo38VGwdPjF4dxlRdo= __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 b6b09f015e459..88fef40ad8f6e 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 @@ -225,7 +225,7 @@ ClusterName: minimal-gce.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 caa546ddf2be7..8356be9f5e096 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 @@ -248,7 +248,7 @@ ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: LsMefdYQUvV36gmpRwX3T187JNM02XHwrkfG/KCplbo= +NodeupConfigHash: U245k5RGkGDhqqrt0+5/ZO1XeXo38VGwdPjF4dxlRdo= __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 eb0118de2cace..8a1ba530e12cc 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 @@ -225,7 +225,7 @@ ClusterName: minimal-gce-ilb.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 3ff34e1c82d39..901c62cd7a13b 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 @@ -248,7 +248,7 @@ ClusterName: minimal-gce-ilb.example.com ConfigBase: memfs://tests/minimal-gce-ilb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: RIPEa1XKvYwmMnx8My5rZCkGjTSMGnLKHbmn6HyuGKA= +NodeupConfigHash: whHpudxrwuy7D1SvI0UDGezHgfM4CYDMpm5B3aNzTGY= __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 62b0930f7c294..7eaf499be3f78 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 @@ -225,7 +225,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 f952587e3a9fe..bb02f581dc890 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 @@ -248,7 +248,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: CKGLmHs46/jd/F8HaXE9hA+FIZa+2DhFrouX+c87JI8= +NodeupConfigHash: r4nsiLBb9wfLdtim3WT6WxbSQlA7i7Ap6DTGaNni5Bs= __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 62b0930f7c294..7eaf499be3f78 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 @@ -225,7 +225,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 f952587e3a9fe..bb02f581dc890 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 @@ -248,7 +248,7 @@ ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: CKGLmHs46/jd/F8HaXE9hA+FIZa+2DhFrouX+c87JI8= +NodeupConfigHash: r4nsiLBb9wfLdtim3WT6WxbSQlA7i7Ap6DTGaNni5Bs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 3df1d22032685..8d2820dd1fb50 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -225,7 +225,7 @@ ClusterName: minimal-gce-plb.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script index c5df919535060..4fbb77602ce2e 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_startup-script @@ -248,7 +248,7 @@ ClusterName: minimal-gce-plb.example.com ConfigBase: memfs://tests/minimal-gce-plb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: TKbwt9p6z89XD3u33yqL4tLL65uDL6Y78Ytt2CDAzvo= +NodeupConfigHash: gx4ho/cd4kfjv8btFEFN463xHRFxCMmQitI0vzGeaD8= __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 df49015ea2aba..ff128106374dc 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 @@ -225,7 +225,7 @@ ClusterName: minimal-gce-private.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 4031a015ce777..38f9c98610413 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 @@ -248,7 +248,7 @@ ClusterName: minimal-gce-private.example.com ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: VFkMz1qMzi4IQJ6MeExz6Jx/YkU75Qz2yvZXu17oLYU= +NodeupConfigHash: uPgEh99424zYC4vMoEeZP4ne2S83J+LG47NQbTrNXqU= __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 164d217951663..3b5d223cb9e4a 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 @@ -258,7 +258,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: u/sNRmbO88aGtEjasJ2T1LiqRjaZ9ePjRI62ojmBtuU= +NodeupConfigHash: p7O50XcyYpKyXL9rEG3C3fFR8+SO0yDlrq44JFT2770= __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 30168e9f9290d..8c1198bf20f20 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 @@ -226,7 +226,7 @@ ClusterName: minimal.k8s.local ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 5f60437824787..0808b5985b3ed 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 @@ -258,7 +258,7 @@ ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 0iQadPmZ+E2Oyb6xEQ3rP9UHUUJwMqnaLuzwajfW6AE= +NodeupConfigHash: F26P/kgwvcY1uR1HUcer3k5r4OINaNC3EYJgl3XDTmk= __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 1453b972400ad..49c771e9322c5 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 @@ -226,7 +226,7 @@ ClusterName: minimal.k8s.local ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 125f1f54372e9..3b8aa8ac997b0 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 @@ -223,7 +223,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 1ba4b097bf723..d525c5565159a 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 @@ -247,7 +247,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-fsn1 InstanceGroupRole: ControlPlane -NodeupConfigHash: Kr90tIrCZIWGi3mPgZCKNZy9rAvMKJthR1pOg8625Go= +NodeupConfigHash: kXB/OeMy4hfI0aEWI7nm1s+7inyA7faWdlhJ+3oq9Lo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content index 4265b799b2d63..eb0173ff538fb 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content +++ b/tests/integration/update_cluster/minimal_scaleway/data/aws_s3_object_nodeupconfig-control-plane-fr-par-1_content @@ -223,7 +223,7 @@ ClusterName: scw-minimal.k8s.local ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data index 8ad92b01f971f..6c758d20d9cec 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data +++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data @@ -249,7 +249,7 @@ ClusterName: scw-minimal.k8s.local ConfigBase: memfs://tests/scw-minimal.k8s.local InstanceGroupName: control-plane-fr-par-1 InstanceGroupRole: ControlPlane -NodeupConfigHash: ivqvjX+GSSCTKfZBbdz/14CUgKmd7pNAm65O074A0TY= +NodeupConfigHash: kY8Bq9vsi3akkvsZIpdOGBAoVV0zizOyfe7NVhsSCH0= __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 7bc8c61cc7402..1f159e6840347 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 @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: aFVB7O2gdEi7ltRVTrxMwrqn80+LSHOqqH1rAi3Y7Y4= +NodeupConfigHash: bxfy6Kn/l+BgdYcVjSOvD1y4T7ZtGtfpNl6gFNoXlvY= __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 25207b2b2f59c..29fa76b96124a 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 @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: IlrnfIoeyHKQ9Wppvy5A6HFduqkD9UFce15b/wqYr/E= +NodeupConfigHash: uu7RSgk3Yg6K69M9QgfIKZhGb16BQ4Xt54n45lJSN3M= __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 156fc0c02b73b..485e3b8f2bb93 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 @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: RZHDQIreOpDBqUT4cThxRyGqiXC594os9smzV4/+NJY= +NodeupConfigHash: YtkKyveBAQxPVgZSfdB5GZDQIrnA43lz52la0ksOuFw= __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 2444794f3580f..b96a52c35efe7 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 @@ -226,7 +226,7 @@ ClusterName: mixedinstances.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 3233471d46e00..602394960b55b 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 @@ -226,7 +226,7 @@ ClusterName: mixedinstances.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 30e711ffadd8f..396ac5b54b0b5 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 @@ -226,7 +226,7 @@ ClusterName: mixedinstances.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 7bc8c61cc7402..1f159e6840347 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 @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: aFVB7O2gdEi7ltRVTrxMwrqn80+LSHOqqH1rAi3Y7Y4= +NodeupConfigHash: bxfy6Kn/l+BgdYcVjSOvD1y4T7ZtGtfpNl6gFNoXlvY= __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 25207b2b2f59c..29fa76b96124a 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 @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: IlrnfIoeyHKQ9Wppvy5A6HFduqkD9UFce15b/wqYr/E= +NodeupConfigHash: uu7RSgk3Yg6K69M9QgfIKZhGb16BQ4Xt54n45lJSN3M= __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 156fc0c02b73b..485e3b8f2bb93 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 @@ -266,7 +266,7 @@ ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: RZHDQIreOpDBqUT4cThxRyGqiXC594os9smzV4/+NJY= +NodeupConfigHash: YtkKyveBAQxPVgZSfdB5GZDQIrnA43lz52la0ksOuFw= __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 2444794f3580f..b96a52c35efe7 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 @@ -226,7 +226,7 @@ ClusterName: mixedinstances.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 3233471d46e00..602394960b55b 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 @@ -226,7 +226,7 @@ ClusterName: mixedinstances.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 30e711ffadd8f..396ac5b54b0b5 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 @@ -226,7 +226,7 @@ ClusterName: mixedinstances.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 b9894711a7759..9645af1720f21 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 @@ -258,7 +258,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: swQsOyjw7ADkLtJwQCtUHZEE1M/FAuHihPYH2xB9Uo8= +NodeupConfigHash: QDrfil7DRhAlxIc9+bFsNw/OLb3I5ju7BjSDJ+NWtgE= __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 a1ad3705f5f4b..ffa72ce001087 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 @@ -226,7 +226,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 1fc9a4d511446..f8ce862a6465a 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 @@ -258,7 +258,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: K/0eGKS8xvJVfqZfnOxz13MCi24+5Vmk8vlUqcwv7gs= +NodeupConfigHash: FJRP+h8TyzaMAd85iixs3t8RV8gLuFMYGITE71cNLqU= __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 99cd36f8028b2..53dbc12d52821 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 @@ -226,7 +226,7 @@ ClusterName: nthimdsprocessor.longclustername.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 50d6dd4b3188b..81962fc9371a1 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 @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Wg7eDduqE95U3VpgNvmLol9muuU7ciSwBoTh8l2lGkc= +NodeupConfigHash: 9oSNMsXZoG+FjVBZ8rV397nKFjW27/YCyAqZ/P39ZWI= __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 41d446ef3b24d..3f4ed42bc94a0 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 9013f7b91fe87..14e5c2444d623 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 @@ -258,7 +258,7 @@ ClusterName: private-shared-ip.example.com ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: HsKTcr1oFz/6c1Pj/XsSVLoIkgykLbQ7rkD0urJ6CMA= +NodeupConfigHash: AE56kGopoE2+y9hmfQIcT9Qvx8M/GkhCTifOiUFkod8= __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 67ac54708b5b7..973998a14f6c6 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 @@ -226,7 +226,7 @@ ClusterName: private-shared-ip.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 2aea0859237d9..421737a993e3b 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 @@ -258,7 +258,7 @@ ClusterName: private-shared-subnet.example.com ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 5YUQr9Xm+k3IG2BNAEqCvwZxSiPk7ENSZuR1Zg22m4Y= +NodeupConfigHash: +Fs+I1OC5gftQLNxE9GQ0jYwbpDCdyISPOzp3pTZ53Q= __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 a2c5a7ac51e76..ed1ed8dc1c902 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 @@ -226,7 +226,7 @@ ClusterName: private-shared-subnet.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 2975bc30f98b0..a057d87f318df 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 @@ -258,7 +258,7 @@ ClusterName: privatecalico.example.com ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: uaeFbE/NBxVshAFuQbsAU9mdtjfqjHzr2GrVJzLuaE0= +NodeupConfigHash: dRrqCtMxnO5ZE+4+1WPKjF8EpC7jIRG/ptgwCBaBUZs= __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 20b948aa9066d..4ce2352968241 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 @@ -226,7 +226,7 @@ ClusterName: privatecalico.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 05c5447da8a8f..ea12da7bfdcd6 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 @@ -258,7 +258,7 @@ ClusterName: privatecanal.example.com ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: rPI5Xk/AmCVERZkrE1/aP9N3krRcMzdOicntg/wU2wg= +NodeupConfigHash: Kf+90mkgmRakspd62LG9iTfbKAJEIahIRGevKB+kRo0= __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 afc59941fda47..928f1fea2ad3f 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 @@ -226,7 +226,7 @@ ClusterName: privatecanal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 428d5e6699f7b..48f1a9a748ac0 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 @@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: VFjiyy5eZs7+KSAUD2PjXHdMnQneydJNkH/LBODBmH8= +NodeupConfigHash: mCjuXQnUcpLXmD5c+GZX8dWjLOiRUgp3wIPcCdrK1PA= __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 78a53ca0c331b..20247c6120a7b 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 @@ -226,7 +226,7 @@ ClusterName: privatecilium.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 6750a5e859ac5..ad386ca02e564 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 @@ -258,7 +258,7 @@ ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: UutfF5SX64gtgbxN4CtP4YUU918JmF8YLc37h/n/iMw= +NodeupConfigHash: LoLnUvle7Qa0iQ0X+Gaqdl9zBHFRcxEVg8VQWlngUkE= __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 1f8f8a88db46b..c9811119592f1 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 @@ -226,7 +226,7 @@ ClusterName: privatecilium.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 28fd2564c11ff..4623c7c5937f2 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 @@ -265,7 +265,7 @@ ClusterName: privateciliumadvanced.example.com ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 2Rm+C3No5QgoJ1skxbz1/gK4Wos/8Dnfw6tfEFbWS0w= +NodeupConfigHash: yoz3GlswJY3ddM13T40QRplNM3dh2kTFSyDDSSAIHG8= __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 6e768f40de24d..3179f6d176682 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 @@ -293,7 +293,7 @@ ClusterName: privateciliumadvanced.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 56d6c92b3bd19..68d6082df6980 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 @@ -258,7 +258,7 @@ ClusterName: privatedns2.example.com ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ckpEHAc/8b7GiIAbwSd9FgBm/QzGYubQjROUyAPRqTU= +NodeupConfigHash: P+t0iiUMiJk5BstNStUdp+9lUtYBFHVzx9v9Vqdcs1E= __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 8b2aeed60fad7..0bb54473e5e26 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 @@ -226,7 +226,7 @@ ClusterName: privatedns2.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 edba995a7e748..ba273873fbf8f 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 @@ -258,7 +258,7 @@ ClusterName: privateflannel.example.com ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: xeBbx6PH5ivY5dwKTh5luj+RBvrHSCzInXrfrJ/TnI8= +NodeupConfigHash: K5HUgV04o8BBdhydU+3gF18F6KuesWT7UfcAbecXOwg= __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 d08afd22eee5e..d405136a3bd16 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 @@ -226,7 +226,7 @@ ClusterName: privateflannel.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 811a141749a8d..9a82f542b7e60 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 @@ -258,7 +258,7 @@ ClusterName: privatekopeio.example.com ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: bAbNWQEtvRunk/dDoU9OuJnORlalHopB5RK57HPbHhs= +NodeupConfigHash: 29Qy3MkyGDwmzTonK0GcttgQVipRru6YH2Sz53Fu2QI= __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 9e621cd6c1daa..df24ed7478925 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 @@ -226,7 +226,7 @@ ClusterName: privatekopeio.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 6fe388650b1ad..e15fe2501faac 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 @@ -258,7 +258,7 @@ ClusterName: sharedsubnet.example.com ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 4euzbznM4VIIFBcl5JVsxm0meGfjK2JrCYxgDDd20CM= +NodeupConfigHash: aUkdub50Ieejh0wtu0W1+722ro95siSILqwg2Ta9V2Y= __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 728e35649db48..e6cbfe725548d 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 @@ -226,7 +226,7 @@ ClusterName: sharedsubnet.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 51c5bd9db8d8a..1ea2c7800749d 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 @@ -258,7 +258,7 @@ ClusterName: sharedvpc.example.com ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: USX5n/0CntDpEPNl5/jULiGPjxhzfcMkzc/S2YLJFcw= +NodeupConfigHash: R73C8NmutS/CQHcmuZbDivubWon9cjqbqcNKFr9qg50= __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 b4c750304fede..eead8d23bf07a 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 @@ -226,7 +226,7 @@ ClusterName: sharedvpc.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 af63434bb491d..5432250c290b1 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 @@ -260,7 +260,7 @@ ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LuQtlKnQZYC8A4b9bT7wEsVCWH0aEHpVhfk4+9cwSJQ= +NodeupConfigHash: dTfjlir8kC1gAJWFBNC234iBZsn4CdSVs8MrhjBhwbs= __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 65a084968e7d8..ca5dd402ea2b2 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 @@ -226,7 +226,7 @@ ClusterName: minimal-ipv6.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 ddc843d767db7..fae51b69e439e 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 @@ -258,7 +258,7 @@ ClusterName: unmanaged.example.com ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: TkbcAbG0QZj+G0MMacTTnijeGz2O64DTyxoU357Cd+M= +NodeupConfigHash: 8LDz0GozpytdKRC8IiHUK3XZ2it+C5yoKF2OlWChVdQ= __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 3aab48f5f7d40..5132568a328a7 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 @@ -226,7 +226,7 @@ ClusterName: unmanaged.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration 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 5d253f67922fd..719f1b0ee5dbc 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 @@ -258,7 +258,7 @@ ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 35aCjWb0mSVhKnZftX18Png0JOsg246cyjYeHvYnobs= +NodeupConfigHash: 2Z4qBD8eyPrCZBnhcB/vPZPUzh1J+94a7QNh8/mtoyU= __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 7d1c48ee7db2c..5166ee692f420 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 @@ -226,7 +226,7 @@ ClusterName: minimal.example.com ContainerRuntime: containerd FileAssets: - content: | - apiVersion: kubescheduler.config.k8s.io/v1beta2 + apiVersion: kubescheduler.config.k8s.io/v1 clientConnection: kubeconfig: /var/lib/kube-scheduler/kubeconfig kind: KubeSchedulerConfiguration