From e22f385a20a1a8e4bb156bab2451d92d8150943b Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Wed, 11 Dec 2024 11:24:30 +0100 Subject: [PATCH 1/3] Add aws CNI compatible cni path Signed-off-by: Mikkel Oscar Lyderik Larsen --- .../node-pools/master-default/userdata.yaml | 18 ++++++++++++++++++ .../node-pools/worker-splitaz/userdata.yaml | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 07de606351..76609c840a 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -928,6 +928,7 @@ write_files: {{- end}} {{- end}} + # TODO: Remove this once all nodes are running an AMI compatible with /etc/cni/net.d/10-flannel.conflist - owner: root:root path: /etc/kubernetes/cni/net.d/10-flannel.conflist content: | @@ -944,3 +945,20 @@ write_files: } ] } + + - owner: root:root + path: /etc/cni/net.d/10-flannel.conflist + content: | + { + "name": "podnet", + "cniVersion": "0.3.1", + "plugins": [ + { + "type": "flannel", + "delegate": { + "isDefaultGateway": true, + "hairpinMode": true + } + } + ] + } diff --git a/cluster/node-pools/worker-splitaz/userdata.yaml b/cluster/node-pools/worker-splitaz/userdata.yaml index b19b6fb1e3..5479b2cb46 100644 --- a/cluster/node-pools/worker-splitaz/userdata.yaml +++ b/cluster/node-pools/worker-splitaz/userdata.yaml @@ -136,6 +136,7 @@ write_files: {{- end}} {{- end}} + # TODO: Remove this once all nodes are running an AMI compatible with /etc/cni/net.d/10-flannel.conflist - owner: root:root path: /etc/kubernetes/cni/net.d/10-flannel.conflist content: | @@ -152,3 +153,20 @@ write_files: } ] } + + - owner: root:root + path: /etc/cni/net.d/10-flannel.conflist + content: | + { + "name": "podnet", + "cniVersion": "0.3.1", + "plugins": [ + { + "type": "flannel", + "delegate": { + "isDefaultGateway": true, + "hairpinMode": true + } + } + ] + } From 549f4aad5d0ef4645b0f19deb9ff5a53ea8b00c3 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Wed, 11 Dec 2024 14:40:19 +0100 Subject: [PATCH 2/3] Update to Kubernetes v1.31.4 https://github.com/kubernetes/kubernetes/releases/tag/v1.31.4 Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/config-defaults.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml index bb63e40b80..771dcbb758 100644 --- a/cluster/config-defaults.yaml +++ b/cluster/config-defaults.yaml @@ -740,8 +740,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_31_jammy_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.0-amd64-master-347" "861068367966" }} -kuberuntu_image_v1_31_jammy_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.0-arm64-master-347" "861068367966" }} +kuberuntu_image_v1_31_jammy_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.4-amd64-master-359" "861068367966" }} +kuberuntu_image_v1_31_jammy_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.31.4-arm64-master-359" "861068367966" }} # Which distro from the previous config items should be used. Valid options are only `jammy` for now. Can be set for each node pool. kuberuntu_distro_master: "jammy" @@ -833,7 +833,7 @@ kubelet_registry_burst: "40" # - upstream: official Kubernetes version # - zalando: internal Zalando build with our custom patches kubernetes_scheduler_image: "zalando" -kubernetes_controller_manager_image: "zalando" +kubernetes_controller_manager_image: "upstream" # when set to true, service account tokens can be used from outside the cluster allow_external_service_accounts: "false" From 0f0c9e71637939b87d5e9c3ea9643f11f6040f03 Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Wed, 18 Dec 2024 16:33:20 +0100 Subject: [PATCH 3/3] align CNI path with AMI --- cluster/manifests/01-aws-node/daemonset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/01-aws-node/daemonset.yaml b/cluster/manifests/01-aws-node/daemonset.yaml index 5c9948dd93..32c8f1df3c 100644 --- a/cluster/manifests/01-aws-node/daemonset.yaml +++ b/cluster/manifests/01-aws-node/daemonset.yaml @@ -238,7 +238,7 @@ spec: type: "" name: cni-bin-dir - hostPath: - path: /etc/kubernetes/cni/net.d #/etc/cni/net.d + path: /etc/cni/net.d type: "" name: cni-net-dir - hostPath: