File tree Expand file tree Collapse file tree 12 files changed +298
-326
lines changed
manifests/aws-cloud-controller-manager Expand file tree Collapse file tree 12 files changed +298
-326
lines changed Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ Resources:
147
147
Type : AWS::EKS::Cluster
148
148
Properties :
149
149
Name : " {{.Cluster.Name}}"
150
- Version : " 1.31 "
150
+ Version : " 1.32 "
151
151
RoleArn : !GetAtt EKSClusterRole.Arn
152
152
KubernetesNetworkConfig :
153
153
IpFamily : " {{.Cluster.ConfigItems.eks_ip_family}}"
Original file line number Diff line number Diff line change @@ -779,18 +779,12 @@ tracing_coredns_local_zone_traces_endpoint: ""
779
779
# AMI id given the image name and the Image AWS account owner.
780
780
#
781
781
# [0]: https://github.com/zalando-incubator/cluster-lifecycle-manager/blob/8a9bd1cb2d094038a9e23e646421f8146b48886a/provisioner/template.go#L116
782
- kuberuntu_image_v1_31_aws_amd64 : {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.6-amd64-master-368" "861068367966" }}
783
- kuberuntu_image_v1_31_aws_arm64 : {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.6-arm64-master-368" "861068367966" }}
784
- kuberuntu_image_v1_31_eks_amd64 : {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.7-amd64-master-371" "861068367966" }}
785
- kuberuntu_image_v1_31_eks_arm64 : {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.7-arm64-master-371" "861068367966" }}
782
+ kuberuntu_image_v1_32_new_amd64 : {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.32.4-amd64-master-373" "861068367966" }}
783
+ kuberuntu_image_v1_32_new_arm64 : {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.32.4-arm64-master-373" "861068367966" }}
786
784
787
785
# This is used to determine which AMI to use for the cluster or individual node
788
- # pools. Possible values are 'aws' or 'eks'
789
- {{if eq .Cluster.Provider "zalando-eks"}}
790
- kuberuntu_ami_version : " eks"
791
- {{else}}
792
- kuberuntu_ami_version : " aws"
793
- {{end}}
786
+ # pools. Possible values are 'new' or 'old'
787
+ kuberuntu_ami_version : " new"
794
788
795
789
# Feature toggle for auditing events
796
790
audit_pod_events : " true"
Original file line number Diff line number Diff line change 28
28
- --cloud-provider=aws
29
29
- --use-service-account-credentials=true
30
30
- --configure-cloud-routes=false
31
- image : container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.4 -master-137
31
+ image : container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.32.1 -master-140
32
32
name : aws-cloud-controller-manager
33
33
resources :
34
34
requests :
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ Mappings:
10
10
Images :
11
11
{{.Cluster.Region}}:
12
12
# 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_31_ " .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
13
+ MachineImage : ' {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_ " .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
14
14
15
15
Resources :
16
16
AutoScalingGroup :
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ Mappings:
11
11
Images :
12
12
{{.Cluster.Region}}:
13
13
# 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_31_ " .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
14
+ MachineImage : ' {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_ " .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
15
15
16
16
Resources :
17
17
AutoScalingGroup :
Original file line number Diff line number Diff line change 7
7
amiFamily : Custom
8
8
amiSelectorTerms :
9
9
# Select on any AMI that has any of the following IDs
10
- - id : {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_31_ " .NodePool.ConfigItems.kuberuntu_ami_version "_amd64") }}
11
- - id : {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_31_ " .NodePool.ConfigItems.kuberuntu_ami_version "_arm64") }}
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") }}
12
12
metadataOptions :
13
13
httpEndpoint : enabled
14
14
# {{ if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ Mappings:
11
11
Images :
12
12
{{.Cluster.Region}}:
13
13
# 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_31_ " .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
14
+ MachineImage : ' {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_32_ " .NodePool.ConfigItems.kuberuntu_ami_version "_" .Values.InstanceInfo.Architecture) }}'
15
15
16
16
Resources :
17
17
{{ with $data := . }}
Original file line number Diff line number Diff line change @@ -169,7 +169,8 @@ write_files:
169
169
{{index $cfg 0}} = {{index $cfg 1}}
170
170
{{- end}}
171
171
{{- end}}
172
- {{if ne .Cluster.Provider "zalando-eks" }}
172
+
173
+ {{- if ne .Cluster.Provider "zalando-eks" }}
173
174
- owner : root:root
174
175
path : /etc/cni/net.d/10-flannel.conflist
175
176
content : |
Original file line number Diff line number Diff line change 1
1
# builder image
2
- FROM golang:1.23 AS builder
2
+ FROM golang:1.24 AS builder
3
3
4
- RUN CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.19 .0
4
+ RUN CGO_ENABLED=0 go install github.com/onsi/ginkgo/v2/ginkgo@v2.21 .0
5
5
6
6
# final image
7
7
# TODO get rid of python dependencies
8
8
# * wait-for-update.py
9
- FROM container-registry.zalando.net/library/python-3.12 -slim:latest
9
+ FROM container-registry.zalando.net/library/python-3.13 -slim:latest
10
10
11
11
ARG TARGETARCH
12
12
@@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq bc curl
16
16
17
17
ARG KUBE_VERSION
18
18
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 "1db18b863f11d507a11c394ec7705495f7baf476db31a0da8392d28d41a1ca88dc0105d3064c35178d9cc3e047354a418662c077f123ae19e6042be19c65fee9 kubernetes-client-linux-amd64.tar.gz\n e974c1db451f095ea74a459dfd03585bd6cac95d038617f7ea3384925e90a194dfaa46fe2b8ffbade32a519ad349282194fa6764bede48a7ffca38753a10b6f9 kubernetes-client-linux-arm64.tar.gz" | grep "${TARGETARCH}" | sha512sum -c - && \
19
+ printf "924bd0cdbef91caab04b5e9c31017c24d9d7c718f6db9e2c61d5c203d579c8f0c00ac7451bd3658d5cdf31d7a08c8ee5884511d8e961f0e9331d00b1f6f03bee kubernetes-client-linux-amd64.tar.gz\n bf84363c16f72863e38d9d67194531aabafb6a82a20e3361354cc037964205557e8a39b62fa23b3c435c87f989838b6619980ea5c325c456e5cd5d47564d1644 kubernetes-client-linux-arm64.tar.gz" | grep "${TARGETARCH}" | sha512sum -c - && \
20
20
tar xvf "kubernetes-client-linux-${TARGETARCH}.tar.gz" --strip-components 3 kubernetes/client/bin/ && \
21
21
rm "kubernetes-client-linux-${TARGETARCH}.tar.gz" && \
22
22
mv kubectl /usr/bin/kubectl
Original file line number Diff line number Diff line change 2
2
3
3
BINARY ?= kubernetes-on-aws-e2e
4
4
VERSION ?= $(shell git describe --tags --always --dirty)
5
- KUBE_VERSION ?= v1.31 .4
5
+ KUBE_VERSION ?= v1.32 .4
6
6
IMAGE ?= pierone.stups.zalan.do/teapot/$(BINARY )
7
7
SOURCES = $(shell find . -name '* .go')
8
8
TAG ?= $(VERSION )
You can’t perform that action at this time.
0 commit comments