Skip to content

Commit c7112da

Browse files
mikkeloscarmikkeloscar
committed
Update to Kubernetes v1.34
Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
1 parent 6be3209 commit c7112da

File tree

14 files changed

+332
-313
lines changed

14 files changed

+332
-313
lines changed

‎cluster/cluster.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Resources:
174174
{{- end }}
175175
Properties:
176176
Name: "{{.Cluster.Name}}"
177-
Version: "1.33"
177+
Version: "1.34"
178178
RoleArn: !GetAtt EKSClusterRole.Arn
179179
KubernetesNetworkConfig:
180180
IpFamily: "{{.Cluster.ConfigItems.eks_ip_family}}"
@@ -306,13 +306,13 @@ Resources:
306306
Type: AWS::EKS::Addon
307307
Properties:
308308
AddonName: eks-pod-identity-agent
309-
AddonVersion: "v1.3.8-eksbuild.2"
309+
AddonVersion: "v1.3.9-eksbuild.3"
310310
ClusterName: !Ref EKSCluster
311311
EKSAddonKubeProxy:
312312
Type: AWS::EKS::Addon
313313
Properties:
314314
AddonName: kube-proxy
315-
AddonVersion: "v1.33.3-eksbuild.6"
315+
AddonVersion: "v1.34.0-eksbuild.4"
316316
ClusterName: !Ref EKSCluster
317317
{{ if eq .Cluster.Environment "e2e" }}
318318
E2EEKSIAMTestRoleReadOnly:

‎cluster/config-defaults.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,8 @@ tracing_coredns_local_zone_traces_endpoint: ""
809809
# AMI id given the image name and the Image AWS account owner.
810810
#
811811
# [0]: https://github.com/zalando-incubator/cluster-lifecycle-manager/blob/8a9bd1cb2d094038a9e23e646421f8146b48886a/provisioner/template.go#L116
812-
kuberuntu_image_v1_33_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.33.4-amd64-master-378" "861068367966" }}
813-
kuberuntu_image_v1_33_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.33.4-arm64-master-378" "861068367966" }}
812+
kuberuntu_image_v1_34_new_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.34.1-amd64-master-380" "861068367966" }}
813+
kuberuntu_image_v1_34_new_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.34.1-arm64-master-380" "861068367966" }}
814814

815815
# This is used to determine which AMI to use for the cluster or individual node
816816
# pools. Possible values are 'new' or 'old'
@@ -1126,10 +1126,6 @@ enable_size_memory_backed_volumes: "true"
11261126
# enable ImageVolume feature flag
11271127
enable_image_volumes: "false"
11281128

1129-
# enable StatefulSetAutoDeletePVC feature flag
1130-
# https://kubernetes.io/blog/2021/12/16/kubernetes-1-23-statefulset-pvc-auto-deletion/
1131-
enable_statefulset_autodelete_pvc: "true"
1132-
11331129
# Allow configuring ingress rules on the Worker security group. This is used for
11341130
# cases where a service needs a Service Type Load Balancer with an NLB and
11351131
# require the port and optional CIDR range to be added to the worker node

‎cluster/manifests/01-coredns-local/daemonset-coredns.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ spec:
126126
name: dns
127127
protocol: UDP
128128
- containerPort: 9254
129-
name: dns-tcp
129+
name: dnstcp
130130
protocol: TCP
131131
livenessProbe:
132132
httpGet:

‎cluster/manifests/01-coredns-local/service-coredns.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ spec:
1717
- name: dns
1818
port: 53
1919
protocol: UDP
20-
- name: dns-tcp
20+
- name: dnstcp
2121
port: 53
2222
protocol: TCP

‎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_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
13+
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_34_" .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 }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}},KMSv1=true{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}{{if eq .Cluster.ConfigItems.horizontal_pod_autoscaler_configurable_tolerance "true"}},HPAConfigurableTolerance=true{{end}}
158+
- --feature-gates=HPAScaleToZero={{ .Cluster.ConfigItems.enable_hpa_scale_to_zero }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}},KMSv1=true{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}{{if eq .Cluster.ConfigItems.horizontal_pod_autoscaler_configurable_tolerance "true"}},HPAConfigurableTolerance=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 }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}{{if eq .Cluster.ConfigItems.horizontal_pod_autoscaler_configurable_tolerance "true"}},HPAConfigurableTolerance=true{{end}}
623+
- --feature-gates=MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}{{if eq .Cluster.ConfigItems.horizontal_pod_autoscaler_configurable_tolerance "true"}},HPAConfigurableTolerance=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_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
14+
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_34_" .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_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_amd64") }}
11-
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_arm64") }}
10+
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_34_" .NodePool.ConfigItems.kuberuntu_ami_version "_amd64") }}
11+
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_34_" .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_33_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
14+
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_34_" .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
1515

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

‎delivery.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pipeline:
1111
- event: pull_request
1212
vm_config:
1313
type: linux
14-
image: "cdp-runtime/go-1.24"
14+
image: "cdp-runtime/go-1.25"
1515
size: large # speed up building kubernetes/kubernetes
1616
cache:
1717
paths:

0 commit comments

Comments
 (0)