Skip to content

Update to Kubernetes v1.33 #9523

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

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Update to Kubernetes v1.33 #9523

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
2 changes: 1 addition & 1 deletion cluster/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Resources:
Type: AWS::EKS::Cluster
Properties:
Name: "{{.Cluster.Name}}"
Version: "1.32"
Version: "1.33"
RoleArn: !GetAtt EKSClusterRole.Arn
KubernetesNetworkConfig:
IpFamily: "{{.Cluster.ConfigItems.eks_ip_family}}"
Expand Down
4 changes: 2 additions & 2 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,8 +777,8 @@ tracing_coredns_local_zone_traces_endpoint: ""
# AMI id given the image name and the Image AWS account owner.
#
# [0]: https://github.com/zalando-incubator/cluster-lifecycle-manager/blob/8a9bd1cb2d094038a9e23e646421f8146b48886a/provisioner/template.go#L116
kuberuntu_image_v1_32_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.32.4-amd64-master-373" "861068367966" }}
kuberuntu_image_v1_32_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.32.4-arm64-master-373" "861068367966" }}
kuberuntu_image_v1_33_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.33.1-amd64-master-374" "861068367966" }}
kuberuntu_image_v1_33_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.33.1-arm64-master-374" "861068367966" }}

# This is used to determine which AMI to use for the cluster or individual node
# pools. Possible values are 'new' or 'old'
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Mappings:
Images:
{{.Cluster.Region}}:
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'

Resources:
AutoScalingGroup:
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/worker-combined/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Mappings:
Images:
{{.Cluster.Region}}:
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'

Resources:
AutoScalingGroup:
Expand Down
4 changes: 2 additions & 2 deletions cluster/node-pools/worker-karpenter/provisioners.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ spec:
amiFamily: Custom
amiSelectorTerms:
# Select on any AMI that has any of the following IDs
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_amd64") }}
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_arm64") }}
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_amd64") }}
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_arm64") }}
metadataOptions:
httpEndpoint: enabled
# {{ if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/worker-splitaz/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Mappings:
Images:
{{.Cluster.Region}}:
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'

Resources:
{{ with $data := . }}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq bc curl

ARG KUBE_VERSION
RUN curl -L -s --fail "https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${TARGETARCH}.tar.gz" -o "kubernetes-client-linux-${TARGETARCH}.tar.gz" && \
printf "924bd0cdbef91caab04b5e9c31017c24d9d7c718f6db9e2c61d5c203d579c8f0c00ac7451bd3658d5cdf31d7a08c8ee5884511d8e961f0e9331d00b1f6f03bee kubernetes-client-linux-amd64.tar.gz\nbf84363c16f72863e38d9d67194531aabafb6a82a20e3361354cc037964205557e8a39b62fa23b3c435c87f989838b6619980ea5c325c456e5cd5d47564d1644 kubernetes-client-linux-arm64.tar.gz" | grep "${TARGETARCH}" | sha512sum -c - && \
printf "e1681d7addac6d1a192d17d8989764fb8f1143b1bc568de491f757313f6836c8c3180c0ad0d101679f9ac6a27c447865977d691df0db642390923082b5b4024d kubernetes-client-linux-amd64.tar.gz\n47692ea55565da56cddcb57820cd36d586d3a785dadc529d73ab659a904169aa15556d094ace5d2d40e47173c223af98203760abc53f361311bb1496734f6605 kubernetes-client-linux-arm64.tar.gz" | grep "${TARGETARCH}" | sha512sum -c - && \
tar xvf "kubernetes-client-linux-${TARGETARCH}.tar.gz" --strip-components 3 kubernetes/client/bin/ && \
rm "kubernetes-client-linux-${TARGETARCH}.tar.gz" && \
mv kubectl /usr/bin/kubectl
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BINARY ?= kubernetes-on-aws-e2e
VERSION ?= $(shell git describe --tags --always --dirty)
KUBE_VERSION ?= v1.32.4
KUBE_VERSION ?= v1.33.1
IMAGE ?= pierone.stups.zalan.do/teapot/$(BINARY)
SOURCES = $(shell find . -name '*.go')
TAG ?= $(VERSION)
Expand All @@ -11,7 +11,7 @@ DOCKERFILE ?= Dockerfile
default: build

deps:
CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.15.0
CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.21.0

e2e.test: go.mod $(SOURCES)
go test -v -c -o e2e.test
Expand Down
11 changes: 5 additions & 6 deletions test/e2e/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import (
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
"k8s.io/kubernetes/test/e2e/framework/statefulset"
admissionapi "k8s.io/pod-security-admission/api"
"k8s.io/utils/ptr"
)

const (
Expand Down Expand Up @@ -474,7 +473,7 @@ var _ = describe("Image Policy Tests (Job)", func() {
framework.ExpectNoError(err)
}()

job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, ptr.To(batchv1.JobReasonCompletionsReached), 1)
job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, batchv1.JobReasonCompletionsReached, 1)
})

It("Should not create Job using non-compliant image [Image-Policy] [Non-Compliant] [Zalando]", func() {
Expand All @@ -495,7 +494,7 @@ var _ = describe("Image Policy Tests (Job)", func() {
framework.ExpectNoError(err)
}()

job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, ptr.To(batchv1.JobReasonCompletionsReached), 1)
job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, batchv1.JobReasonCompletionsReached, 1)
})
})

Expand Down Expand Up @@ -526,7 +525,7 @@ var _ = describe("Image Policy Tests (Job) (when disabled)", func() {
framework.ExpectNoError(err)
}()

job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, ptr.To(batchv1.JobReasonCompletionsReached), 1)
job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, batchv1.JobReasonCompletionsReached, 1)
})
})

Expand Down Expand Up @@ -560,7 +559,7 @@ var _ = describe("ECR Registry Pull", func() {
framework.ExpectNoError(err)
}()

job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, ptr.To(batchv1.JobReasonCompletionsReached), 1)
job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, batchv1.JobReasonCompletionsReached, 1)
})

It("Should run a Job using a vanity image from the staging registry [ECR] [Zalando]", func() {
Expand All @@ -584,6 +583,6 @@ var _ = describe("ECR Registry Pull", func() {
framework.ExpectNoError(err)
}()

job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, ptr.To(batchv1.JobReasonCompletionsReached), 1)
job.WaitForJobComplete(context.TODO(), cs, namespace, jobObj.Name, batchv1.JobReasonCompletionsReached, 1)
})
})
Loading