Merge pull request #15384 from hakman/kube-scheduler_config_ga

Add kubescheduler.config.k8s.io/v1 for K8s 1.25+
kubernetes · May 9, 2023 · 97d3914 · 97d3914
2 parents 68bf187 + 0e37112
commit 97d3914
Show file tree

Hide file tree

Showing 161 changed files with 167 additions and 161 deletions.
diff --git 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
@@ -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
@@ -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/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -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/...pdate_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -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/...ter/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ter/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/...nch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/...nch_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/...scaler-priority-expander-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...scaler-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/...aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/...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/...er-autoscaler-priority-expander/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...er-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/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@@ -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/...gration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...gration/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/...ustom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/...ustom/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/...pdate_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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/...inerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/...inerd/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/...ation/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ation/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/...luster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/...luster/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/...ntegration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ntegration/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/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@@ -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/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@@ -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/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@@ -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/...ion/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ion/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/...ion/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/...ion/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/...ion/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/...ion/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/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
@@ -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/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
@@ -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/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
@@ -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/...tion/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...tion/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/...tion/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/...tion/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/...tion/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/...tion/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/...rnal_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...rnal_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/...ion/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ion/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/...dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...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/...pdate_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_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/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
@@ -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/...ation/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ation/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/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
@@ -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/...update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...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/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
@@ -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/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
@@ -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/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
@@ -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/...s/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...s/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/...s/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/...s/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