Skip to content

add support for 1.25 #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2023
Merged

add support for 1.25 #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Copy link
Contributor

@prateekgogia prateekgogia Feb 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happens if SA already exists in the cluster and someone runs make apply?

Copy link
Author

@ivelichkovich ivelichkovich Feb 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will work if it already exists and was created by the helm chart. If it was manually created though then helm will have a conflict with it.

| 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
Expand Down
6 changes: 3 additions & 3 deletions operator/pkg/controllers/master/kubecontrollermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -286,15 +286,15 @@ 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)
}

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
Expand Down
4 changes: 2 additions & 2 deletions operator/pkg/controllers/master/kubescheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion operator/pkg/utils/imageprovider/imageprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ var (
"1.22": kubeVersion122Tag,
"1.23": kubeVersion123Tag,
"1.24": kubeVersion124Tag,
"1.25": kubeVersion125Tag,
}
)

Expand All @@ -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"
)
Expand Down Expand Up @@ -77,4 +79,4 @@ func AWSEncryptionProvider() string {

func BusyBox() string {
return busyBoxImage
}
}