Support for v1.23 in KIT Operator (#294)

Author: smahendarkar

operator/pkg/controllers/master/kubeapiserver.go

@@ -144,7 +144,8 @@ func apiServerPodSpecFor(controlPlane *v1alpha1.ControlPlane) v1.PodSpec {
 					"--audit-policy-file=/etc/kubernetes/audit-policy/audit-policy.yaml",
 					"--audit-log-path=/var/log/kubernetes/audit/" + fmt.Sprintf("%s-%s-$(POD_NAME).log", controlPlane.Namespace, controlPlane.ClusterName()),
 					"--audit-log-maxbackup=1",
-					"--profiling=false",
+					"--profiling=true",
+					"--cloud-provider=external",
 					"--shutdown-delay-duration=5s",
 					"--authentication-token-webhook-cache-ttl=7m",
 					"--enable-aggregator-routing=true",

operator/pkg/controllers/master/kubecontrollermanager.go

@@ -118,6 +118,7 @@ func kcmPodSpecFor(controlPlane *v1alpha1.ControlPlane) v1.PodSpec {
 				"--horizontal-pod-autoscaler-use-rest-clients=true",
 				"--feature-gates=RotateKubeletServerCertificate=true",
 				"--logtostderr=true",
+				"--large-cluster-size-threshold=100000",
 				"--v=2",
 			},
 			VolumeMounts: []v1.VolumeMount{{
@@ -257,7 +258,7 @@ var (
 
 func kcmPodSpecForVersion(version string, defaultSpec *v1.PodSpec) v1.PodSpec {
 	switch version {
-	case "1.22":
+	case "1.22", "1.23", "1.24":
 		args := []string{}
 		for _, arg := range defaultSpec.Containers[0].Args {
 			if _, skip := disabledFlagsForKube122[strings.Split(arg, "=")[0]]; skip {
@@ -272,15 +273,15 @@ func kcmPodSpecForVersion(version string, defaultSpec *v1.PodSpec) v1.PodSpec {
 
 func kcmHealthCheckPortForVersion(version string) intstr.IntOrString {
 	switch version {
-	case "1.22":
+	case "1.22", "1.23", "1.24":
 		return intstr.FromInt(10257)
 	}
 	return intstr.FromInt(10252)
 }
 
 func kcmHealthCheckSchemeForVersion(version string) v1.URIScheme {
 	switch version {
-	case "1.22":
+	case "1.22", "1.23", "1.24":
 		return v1.URISchemeHTTPS
 	}
 	return v1.URISchemeHTTP

operator/pkg/controllers/master/kubescheduler.go

@@ -87,7 +87,7 @@ func schedulerPodSpecFor(controlPlane *v1alpha1.ControlPlane) v1.PodSpec {
 				},
 			},
 			Ports: []v1.ContainerPort{{
-				ContainerPort: 10251,
+				ContainerPort: int32(kschHealthCheckPortForVersion(controlPlane.Spec.KubernetesVersion)),
 				Name:          "metrics",
 			}},
 			Args: []string{
@@ -112,9 +112,9 @@ func schedulerPodSpecFor(controlPlane *v1alpha1.ControlPlane) v1.PodSpec {
 				ProbeHandler: v1.ProbeHandler{
 					HTTPGet: &v1.HTTPGetAction{
 						Host:   "127.0.0.1",
-						Scheme: v1.URISchemeHTTP,
+						Scheme: kschHealthCheckSchemeForVersion(controlPlane.Spec.KubernetesVersion),
 						Path:   "/healthz",
-						Port:   intstr.FromInt(10251),
+						Port:   intstr.FromInt(kschHealthCheckPortForVersion(controlPlane.Spec.KubernetesVersion)),
 					},
 				},
 				InitialDelaySeconds: 10,
@@ -146,3 +146,18 @@ func schedulerPodSpecFor(controlPlane *v1alpha1.ControlPlane) v1.PodSpec {
 		}},
 	}
 }
+
+func kschHealthCheckPortForVersion(version string) int {
+	switch version {
+	case "1.23", "1.24":
+		return 10259
+	}
+	return 10251
+}
+func kschHealthCheckSchemeForVersion(version string) v1.URIScheme {
+	switch version {
+	case "1.23", "1.24":
+		return v1.URISchemeHTTPS
+	}
+	return v1.URISchemeHTTP
+}

operator/pkg/utils/imageprovider/imageprovider.go

@@ -20,6 +20,7 @@ var (
 		"1.20": kubeVersion120Tag,
 		"1.21": kubeVersion121Tag,
 		"1.22": kubeVersion122Tag,
+		"1.23": kubeVersion123Tag,
 	}
 )
 
@@ -33,6 +34,7 @@ const (
 	kubeVersion120Tag = "v1.20.7-eks-1-20-6"
 	kubeVersion121Tag = "v1.21.2-eks-1-21-4"
 	kubeVersion122Tag = "v1.22.6-eks-1-22-5"
+	kubeVersion123Tag = "v1.23.9-eks-1-23-5"
 	repositoryName    = "public.ecr.aws/eks-distro/"
 	busyBoxImage      = "public.ecr.aws/docker/library/busybox:stable"
 )