diff --git a/operator/Makefile b/operator/Makefile index 5b12e39a..ad711721 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -51,6 +51,7 @@ apply: ## Apply the controller into your ~/.kube/config cluster $(HELM_OPTS) \ --set controller.image=ko://github.com/awslabs/kubernetes-iteration-toolkit/operator/cmd/controller \ --set webhook.image=ko://github.com/awslabs/kubernetes-iteration-toolkit/operator/cmd/webhook \ + --set serviceAccount.create=true \ | KO_DOCKER_REPO=$(CONTAINER_IMAGE_REGISTRY)/kit $(WITH_GOFLAGS) ko apply --platform=linux/arm64,linux/amd64 --bare -f - delete: ## Delete the controller from your ~/.kube/config cluster diff --git a/operator/pkg/controllers/master/kubecontrollermanager.go b/operator/pkg/controllers/master/kubecontrollermanager.go index 1df2bf7e..bbd24379 100644 --- a/operator/pkg/controllers/master/kubecontrollermanager.go +++ b/operator/pkg/controllers/master/kubecontrollermanager.go @@ -271,7 +271,7 @@ var ( func kcmPodSpecForVersion(version string, defaultSpec *v1.PodSpec) v1.PodSpec { switch version { - case "1.22", "1.23", "1.24": + case "1.22", "1.23", "1.24", "1.25": args := []string{} for _, arg := range defaultSpec.Containers[0].Args { if _, skip := disabledFlagsForKube122[strings.Split(arg, "=")[0]]; skip { @@ -286,7 +286,7 @@ func kcmPodSpecForVersion(version string, defaultSpec *v1.PodSpec) v1.PodSpec { func kcmHealthCheckPortForVersion(version string) intstr.IntOrString { switch version { - case "1.22", "1.23", "1.24": + case "1.22", "1.23", "1.24", "1.25": return intstr.FromInt(10257) } return intstr.FromInt(10252) @@ -294,7 +294,7 @@ func kcmHealthCheckPortForVersion(version string) intstr.IntOrString { func kcmHealthCheckSchemeForVersion(version string) v1.URIScheme { switch version { - case "1.22", "1.23", "1.24": + case "1.22", "1.23", "1.24", "1.25": return v1.URISchemeHTTPS } return v1.URISchemeHTTP diff --git a/operator/pkg/controllers/master/kubescheduler.go b/operator/pkg/controllers/master/kubescheduler.go index e2b01979..6e0729a0 100644 --- a/operator/pkg/controllers/master/kubescheduler.go +++ b/operator/pkg/controllers/master/kubescheduler.go @@ -149,14 +149,14 @@ func schedulerPodSpecFor(controlPlane *v1alpha1.ControlPlane) v1.PodSpec { func kschHealthCheckPortForVersion(version string) int { switch version { - case "1.23", "1.24": + case "1.23", "1.24", "1.25": return 10259 } return 10251 } func kschHealthCheckSchemeForVersion(version string) v1.URIScheme { switch version { - case "1.23", "1.24": + case "1.23", "1.24", "1.25": return v1.URISchemeHTTPS } return v1.URISchemeHTTP diff --git a/operator/pkg/utils/imageprovider/imageprovider.go b/operator/pkg/utils/imageprovider/imageprovider.go index cb035939..9c432878 100644 --- a/operator/pkg/utils/imageprovider/imageprovider.go +++ b/operator/pkg/utils/imageprovider/imageprovider.go @@ -22,6 +22,7 @@ var ( "1.22": kubeVersion122Tag, "1.23": kubeVersion123Tag, "1.24": kubeVersion124Tag, + "1.25": kubeVersion125Tag, } ) @@ -38,6 +39,7 @@ const ( kubeVersion122Tag = "v1.22.16-eks-1-22-14" kubeVersion123Tag = "v1.23.13-eks-1-23-9" kubeVersion124Tag = "v1.24.8-eks-1-24-5" + kubeVersion125Tag = "v1.25.5-eks-1-25-3" repositoryName = "public.ecr.aws/eks-distro/" busyBoxImage = "public.ecr.aws/docker/library/busybox:stable" ) @@ -77,4 +79,4 @@ func AWSEncryptionProvider() string { func BusyBox() string { return busyBoxImage -} \ No newline at end of file +}