From eaf05fb3fe0843d1493fa21cd854b73257c55658 Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:07:00 +0000 Subject: [PATCH 01/15] skipper: Update to version v0.21.241 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.241 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 41653d70af..ff547086b4 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.240 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.241 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.240 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.241 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.240 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.241 args: - skipper - -access-log-strip-query From ba9befb24b38f41e1be9a19afb29cfeff39af85e Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:23:21 +0000 Subject: [PATCH 02/15] skipper: Update to version v0.21.242 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.242 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index ff547086b4..b7d62ceba9 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.241 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.242 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.241 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.242 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.241 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.242 args: - skipper - -access-log-strip-query From e28f008c35025b75700e33afcbfeadc06d75734c Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:37:10 +0000 Subject: [PATCH 03/15] skipper: Update to version v0.21.243 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.243 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index b7d62ceba9..f3bd01439d 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.242 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.243 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.242 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.243 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.242 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.243 args: - skipper - -access-log-strip-query From a79885569bb0c6e91d0ec4ab56453db1204899af Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 23:56:51 +0000 Subject: [PATCH 04/15] skipper: Update to version v0.21.244 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.244 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index f3bd01439d..3c5e8cac22 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.243 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.244 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.243 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.244 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.243 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.244 args: - skipper - -access-log-strip-query From e600dd6bc474f816f8c31afa922d11e1dbabaa81 Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:03:34 +0000 Subject: [PATCH 05/15] skipper: Update to version v0.21.245 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.245 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 3c5e8cac22..fb2d06b393 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.244 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.245 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.244 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.245 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.244 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.245 args: - skipper - -access-log-strip-query From 3c3f8ef5e7fba23c73f8bd88b3f2ccdedf768590 Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:37:27 +0000 Subject: [PATCH 06/15] skipper: Update to version v0.21.246 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.246 --- cluster/node-pools/master-default/userdata.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index fb2d06b393..0b27f6f374 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.245 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.246 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.245 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.246 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.245 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.246 args: - skipper - -access-log-strip-query @@ -599,11 +599,7 @@ write_files: effect: NoSchedule containers: - name: kube-controller-manager -{{- if eq .Cluster.ConfigItems.kubernetes_controller_manager_image "zalando" }} - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/kube-controller-manager-internal:v1.31.3-master-133 -{{- else }} - image: nonexistent.zalan.do/teapot/kube-controller-manager:fixed -{{- end }} + image: nonexistent.zalan.do/teapot/{{if eq .Cluster.ConfigItems.kubernetes_controller_manager_image "zalando" }}kube-controller-manager-internal{{else}}kube-controller-manager{{end}}:fixed args: - --kubeconfig=/etc/kubernetes/controller-manager-kubeconfig - --leader-elect=true From 7c87ea21a784ea2e1057856f5cdb7335ecb125df Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:17:53 +0000 Subject: [PATCH 07/15] skipper: Update to version v0.21.247 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.247 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 0b27f6f374..e24011ffc8 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.246 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.247 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.246 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.247 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.246 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.247 args: - skipper - -access-log-strip-query From 73b7f38e4ab63f018e1e442da13bfdc09763e9ce Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:43:31 +0000 Subject: [PATCH 08/15] skipper: Update to version v0.21.248 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.248 --- cluster/node-pools/master-default/userdata.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index e24011ffc8..66d76076a3 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -206,7 +206,7 @@ write_files: limits: memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}} {{- end }} - - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-228 + - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-232 name: admission-controller lifecycle: preStop: @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.247 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.248 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.247 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.248 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.247 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.248 args: - skipper - -access-log-strip-query From c13818ebc7b09e9fc13dedd12877813d4b1ffd3c Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:57:20 +0000 Subject: [PATCH 09/15] skipper: Update to version v0.21.249 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.249 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 66d76076a3..caba5aeb88 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.248 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.249 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.248 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.249 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.248 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.249 args: - skipper - -access-log-strip-query From 07356c96ae463e66eb74c412e86c4f66ff5bc148 Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:13:21 +0000 Subject: [PATCH 10/15] skipper: Update to version v0.21.250 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.250 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index caba5aeb88..51e2c63cb5 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.249 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.250 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.249 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.250 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.249 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.250 args: - skipper - -access-log-strip-query From b377f54f426445df31647697a4e43620514f74b3 Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:27:26 +0000 Subject: [PATCH 11/15] skipper: Update to version v0.21.251 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.251 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 51e2c63cb5..0bb390e4d2 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.250 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.251 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.250 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.251 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.250 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.251 args: - skipper - -access-log-strip-query From 680a917641149c056106a7aa470dca34d4396e25 Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 09:48:07 +0000 Subject: [PATCH 12/15] skipper: Update to version v0.21.252 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper to version v0.21.252 --- cluster/node-pools/master-default/userdata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 0bb390e4d2..800f564bff 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -247,7 +247,7 @@ write_files: name: admission-controller-kubeconfig readOnly: true - name: skipper-admission-webhook - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.251 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.252 args: - webhook - --address=:9085 @@ -424,7 +424,7 @@ write_files: value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }} {{ end }} - name: skipper-proxy - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.251 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.252 args: - skipper - -access-log-strip-query @@ -475,7 +475,7 @@ write_files: name: ssl-certs-kubernetes readOnly: true - name: skipper-metrics - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.251 + image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.252 args: - skipper - -access-log-strip-query From b1d87243f8894e2c1a9ac9710a9b1b9ba4d6b325 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Fri, 17 Jan 2025 11:40:15 +0100 Subject: [PATCH 13/15] Make internal subnet control associate-public-ip Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/config-defaults.yaml | 9 ++++++--- cluster/node-pools/master-default/stack.yaml | 2 +- cluster/node-pools/worker-combined/stack.yaml | 2 ++ cluster/node-pools/worker-karpenter/provisioners.yaml | 2 +- cluster/node-pools/worker-splitaz/stack.yaml | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml index 237326831e..74ea5f4507 100644 --- a/cluster/config-defaults.yaml +++ b/cluster/config-defaults.yaml @@ -44,9 +44,6 @@ karpenter_max_pods_per_node: "32" # legacy => 0.36.2-main-25.patched karpenter_version: "current" -# Configure whether to associate public ip when launching instances. -associate_public_ip_on_launch: "true" - # ALB config created by kube-aws-ingress-controller kube_aws_ingress_controller_ssl_policy: "ELBSecurityPolicy-TLS-1-2-2017-01" kube_aws_ingress_controller_idle_timeout: "1m" @@ -1157,8 +1154,14 @@ control_plane_load_balancer_internal: "none" # Optionally use internal subnets for running the nodes. This can be configured # a node pool level to only run a subset of nodes in the internal subnets. +# If this is true then `associate_public_ip_on_launch` is automatically treated +# as false. internal_node_subnets_enabled: "false" +# Configure whether to associate public ip when launching instances. +# This is only relevant when `internal_node_subnets_enabled` is false. +associate_public_ip_on_launch: "true" + # This allows setting custom sysctl settings. The config-item is intended to be # used on node-pools rather being set globally. # diff --git a/cluster/node-pools/master-default/stack.yaml b/cluster/node-pools/master-default/stack.yaml index d0004925eb..d19dbf9590 100644 --- a/cluster/node-pools/master-default/stack.yaml +++ b/cluster/node-pools/master-default/stack.yaml @@ -85,7 +85,7 @@ Resources: VolumeType: gp3 NetworkInterfaces: - DeviceIndex: 0 - # {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }} + # {{ if and (eq .NodePool.ConfigItems.associate_public_ip_on_launch "true") (ne .NodePool.ConfigItems.internal_node_subnets_enabled "true") }} AssociatePublicIpAddress: true # {{ end }} Groups: diff --git a/cluster/node-pools/worker-combined/stack.yaml b/cluster/node-pools/worker-combined/stack.yaml index a9653f094f..10b75248a0 100644 --- a/cluster/node-pools/worker-combined/stack.yaml +++ b/cluster/node-pools/worker-combined/stack.yaml @@ -154,7 +154,9 @@ Resources: VolumeType: gp3 NetworkInterfaces: - DeviceIndex: 0 + # {{ if and (eq .NodePool.ConfigItems.associate_public_ip_on_launch "true") (ne .NodePool.ConfigItems.internal_node_subnets_enabled "true") }} AssociatePublicIpAddress: true + # {{ end }} Groups: - !ImportValue '{{ .Cluster.ID }}:worker-security-group' EbsOptimized: false diff --git a/cluster/node-pools/worker-karpenter/provisioners.yaml b/cluster/node-pools/worker-karpenter/provisioners.yaml index f10b57e79e..d02f9acc9c 100644 --- a/cluster/node-pools/worker-karpenter/provisioners.yaml +++ b/cluster/node-pools/worker-karpenter/provisioners.yaml @@ -25,7 +25,7 @@ spec: securityGroupSelectorTerms: - tags: karpenter.sh/discovery: "{{ .Cluster.ID }}/WorkerNodeSecurityGroup" - # {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }} + # {{ if and (eq .NodePool.ConfigItems.associate_public_ip_on_launch "true") (ne .NodePool.ConfigItems.internal_node_subnets_enabled "true") }} associatePublicIPAddress: true # {{ end }} instanceProfile: "{{ .Cluster.ID | awsValidID }}-WorkerKarpenter-InstanceProfile" diff --git a/cluster/node-pools/worker-splitaz/stack.yaml b/cluster/node-pools/worker-splitaz/stack.yaml index b9a0f41c3b..975d0c79a3 100644 --- a/cluster/node-pools/worker-splitaz/stack.yaml +++ b/cluster/node-pools/worker-splitaz/stack.yaml @@ -159,7 +159,7 @@ Resources: VolumeType: gp3 NetworkInterfaces: - DeviceIndex: 0 - # {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }} + # {{ if and (eq .NodePool.ConfigItems.associate_public_ip_on_launch "true") (ne .NodePool.ConfigItems.internal_node_subnets_enabled "true") }} AssociatePublicIpAddress: true # {{ end }} Groups: From 96c26c45074ffcdfec6323736c3a45466180b28b Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:21:19 +0000 Subject: [PATCH 14/15] aws-cloud-controller-manager-internal: Update to version v1.31.4-master-137 Update container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal to version v1.31.4-master-137 --- cluster/manifests/aws-cloud-controller-manager/daemonset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/aws-cloud-controller-manager/daemonset.yaml b/cluster/manifests/aws-cloud-controller-manager/daemonset.yaml index 6a1a5f2008..bd1c6d4163 100644 --- a/cluster/manifests/aws-cloud-controller-manager/daemonset.yaml +++ b/cluster/manifests/aws-cloud-controller-manager/daemonset.yaml @@ -27,7 +27,7 @@ spec: - --cloud-provider=aws - --use-service-account-credentials=true - --configure-cloud-routes=false - image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.4-master-136 + image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.31.4-master-137 name: aws-cloud-controller-manager resources: requests: From 7597b26eab384bc9e64c7095dbfafc919edfa4ec Mon Sep 17 00:00:00 2001 From: "k8s-on-aws-manager-app[bot]" <181735053+k8s-on-aws-manager-app[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:17:34 +0000 Subject: [PATCH 15/15] admission-controller: Update to version master-234 Update 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller to version master-234 --- cluster/node-pools/master-default/userdata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml index 6d573d68ff..f86701c279 100644 --- a/cluster/node-pools/master-default/userdata.yaml +++ b/cluster/node-pools/master-default/userdata.yaml @@ -206,7 +206,7 @@ write_files: limits: memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}} {{- end }} - - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-232 + - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-234 name: admission-controller lifecycle: preStop: