Skip to content

Commit bd2b0a5

Browse files
mikkeloscarmikkeloscar
committed
Update to Kubernetes v1.33
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
1 parent 0577e72 commit bd2b0a5

File tree

13 files changed

+344
-284
lines changed

13 files changed

+344
-284
lines changed

‎cluster/cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Resources:
147147
Type: AWS::EKS::Cluster
148148
Properties:
149149
Name: "{{.Cluster.Name}}"
150-
Version: "1.32"
150+
Version: "1.33"
151151
RoleArn: !GetAtt EKSClusterRole.Arn
152152
KubernetesNetworkConfig:
153153
IpFamily: "{{.Cluster.ConfigItems.eks_ip_family}}"

‎cluster/config-defaults.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,8 @@ tracing_coredns_local_zone_traces_endpoint: ""
776776
# AMI id given the image name and the Image AWS account owner.
777777
#
778778
# [0]: https://github.com/zalando-incubator/cluster-lifecycle-manager/blob/8a9bd1cb2d094038a9e23e646421f8146b48886a/provisioner/template.go#L116
779-
kuberuntu_image_v1_32_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.32.4-amd64-master-373" "861068367966" }}
780-
kuberuntu_image_v1_32_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.32.4-arm64-master-373" "861068367966" }}
779+
kuberuntu_image_v1_33_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.33.1-amd64-master-374" "861068367966" }}
780+
kuberuntu_image_v1_33_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.33.1-arm64-master-374" "861068367966" }}
781781

782782
# This is used to determine which AMI to use for the cluster or individual node
783783
# pools. Possible values are 'new' or 'old'
@@ -945,9 +945,6 @@ enable_default_sa: "false"
945945
vm_dirty_background_bytes: "67108864"
946946
vm_dirty_bytes: "134217728"
947947

948-
# Option to Enable FeatureGate TopologyAwareHints
949-
enable_topology_aware_hints: "false"
950-
951948
# Enable FeatureGate HPAScaleToZero
952949
enable_hpa_scale_to_zero: "true"
953950

‎cluster/manifests/kube-proxy/configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ data:
2323
tcpEstablishedTimeout: 24h0m0s
2424
enableProfiling: false
2525
featureGates:
26-
TopologyAwareHints: {{ .Cluster.ConfigItems.enable_topology_aware_hints }}
2726
SizeMemoryBackedVolumes: {{ .Cluster.ConfigItems.enable_size_memory_backed_volumes }}
2827
{{- if eq .Cluster.ConfigItems.enable_image_volumes "true" }}
2928
ImageVolume: true

‎cluster/node-pools/master-default/stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Mappings:
1010
Images:
1111
{{.Cluster.Region}}:
1212
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
13-
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
13+
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
1414

1515
Resources:
1616
AutoScalingGroup:

‎cluster/node-pools/master-default/userdata.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ write_files:
155155
- "--oidc-username-prefix=okta:"
156156
- --oidc-groups-claim=groups
157157
- "--oidc-groups-prefix=okta:"
158-
- --feature-gates=HPAScaleToZero={{ .Cluster.ConfigItems.enable_hpa_scale_to_zero }},StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}},KMSv1=true{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}
158+
- --feature-gates=HPAScaleToZero={{ .Cluster.ConfigItems.enable_hpa_scale_to_zero }},StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}},KMSv1=true{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}
159159
- --service-account-key-file=/etc/kubernetes/ssl/service-account-public-key.pem
160160
- --service-account-signing-key-file=/etc/kubernetes/ssl/service-account-private-key.pem
161161
- --service-account-issuer={{ .Cluster.APIServerURL }}
@@ -620,7 +620,7 @@ write_files:
620620
- --root-ca-file=/etc/kubernetes/ssl/ca.pem
621621
- --cloud-provider=external
622622
- --cloud-config=/etc/kubernetes/cloud-config.ini
623-
- --feature-gates=StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}
623+
- --feature-gates=StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}
624624
- --use-service-account-credentials=true
625625
- --configure-cloud-routes=false
626626
- --allocate-node-cidrs=true

‎cluster/node-pools/worker-combined/stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Mappings:
1111
Images:
1212
{{.Cluster.Region}}:
1313
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
14-
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
14+
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
1515

1616
Resources:
1717
AutoScalingGroup:

‎cluster/node-pools/worker-karpenter/provisioners.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ spec:
77
amiFamily: Custom
88
amiSelectorTerms:
99
# Select on any AMI that has any of the following IDs
10-
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_amd64") }}
11-
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_arm64") }}
10+
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_amd64") }}
11+
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_arm64") }}
1212
metadataOptions:
1313
httpEndpoint: enabled
1414
# {{ if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}

‎cluster/node-pools/worker-splitaz/stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Mappings:
1111
Images:
1212
{{.Cluster.Region}}:
1313
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
14-
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
14+
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
1515

1616
Resources:
1717
{{ with $data := . }}

‎test/e2e/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq bc curl
1616

1717
ARG KUBE_VERSION
1818
RUN curl -L -s --fail "https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${TARGETARCH}.tar.gz" -o "kubernetes-client-linux-${TARGETARCH}.tar.gz" && \
19-
printf "924bd0cdbef91caab04b5e9c31017c24d9d7c718f6db9e2c61d5c203d579c8f0c00ac7451bd3658d5cdf31d7a08c8ee5884511d8e961f0e9331d00b1f6f03bee kubernetes-client-linux-amd64.tar.gz\nbf84363c16f72863e38d9d67194531aabafb6a82a20e3361354cc037964205557e8a39b62fa23b3c435c87f989838b6619980ea5c325c456e5cd5d47564d1644 kubernetes-client-linux-arm64.tar.gz" | grep "${TARGETARCH}" | sha512sum -c - && \
19+
printf "e1681d7addac6d1a192d17d8989764fb8f1143b1bc568de491f757313f6836c8c3180c0ad0d101679f9ac6a27c447865977d691df0db642390923082b5b4024d kubernetes-client-linux-amd64.tar.gz\n47692ea55565da56cddcb57820cd36d586d3a785dadc529d73ab659a904169aa15556d094ace5d2d40e47173c223af98203760abc53f361311bb1496734f6605 kubernetes-client-linux-arm64.tar.gz" | grep "${TARGETARCH}" | sha512sum -c - && \
2020
tar xvf "kubernetes-client-linux-${TARGETARCH}.tar.gz" --strip-components 3 kubernetes/client/bin/ && \
2121
rm "kubernetes-client-linux-${TARGETARCH}.tar.gz" && \
2222
mv kubectl /usr/bin/kubectl

‎test/e2e/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

1313
deps:
14-
CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.15.0
14+
CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.21.0
1515

1616
e2e.test: go.mod $(SOURCES)
1717
go test -v -c -o e2e.test

0 commit comments

Comments
 (0)