From 10e716b94324fc8aa061de3de0097f03c5f9c289 Mon Sep 17 00:00:00 2001 From: Roman Zavodskikh Date: Fri, 24 May 2024 14:57:01 +0200 Subject: [PATCH 1/6] Update skipper version, step 2/2 Signed-off-by: Roman Zavodskikh --- cluster/manifests/skipper/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml index 7c22eb633c..3b207e1200 100644 --- a/cluster/manifests/skipper/deployment.yaml +++ b/cluster/manifests/skipper/deployment.yaml @@ -1,4 +1,4 @@ -{{ $internal_version := "v0.21.91-921" }} +{{ $internal_version := "v0.21.99-931" }} {{ $canary_internal_version := "v0.21.99-931" }} {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}} From 08c1d00e899fe12fe18761671ea6e420dcfad712 Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Tue, 28 May 2024 14:01:38 +0200 Subject: [PATCH 2/6] update base images of several applications to amazonlinux or static --- cluster/manifests/coredns-local/daemonset-coredns.yaml | 2 +- cluster/manifests/etcd-backup/cronjob.yaml | 2 +- cluster/manifests/flannel/daemonset.yaml | 2 +- cluster/manifests/node-monitor/daemonset.yaml | 2 +- test/e2e/loadtest/client/loadtest-deployment.yaml | 2 +- test/e2e/util.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster/manifests/coredns-local/daemonset-coredns.yaml b/cluster/manifests/coredns-local/daemonset-coredns.yaml index 01130575e4..f49241c065 100644 --- a/cluster/manifests/coredns-local/daemonset-coredns.yaml +++ b/cluster/manifests/coredns-local/daemonset-coredns.yaml @@ -163,7 +163,7 @@ spec: memory: {{.Cluster.ConfigItems.dns_dnsmasq_sidecar_mem}} {{ end }} - name: coredns - image: container-registry.zalando.net/teapot/coredns:1.11.3-master-23 + image: container-registry.zalando.net/teapot/coredns:1.11.3-master-24 args: [ "-conf", "/etc/coredns/Corefile" ] env: - name: ZONE diff --git a/cluster/manifests/etcd-backup/cronjob.yaml b/cluster/manifests/etcd-backup/cronjob.yaml index 21e68fd46e..8df7a6427b 100644 --- a/cluster/manifests/etcd-backup/cronjob.yaml +++ b/cluster/manifests/etcd-backup/cronjob.yaml @@ -31,7 +31,7 @@ spec: restartPolicy: Never containers: - name: etcd-backup - image: container-registry.zalando.net/teapot/etcd-backup:master-20 + image: container-registry.zalando.net/teapot/etcd-backup:master-26 env: - name: ETCD_S3_BACKUP_BUCKET value: "{{ .Cluster.ConfigItems.etcd_s3_backup_bucket }}" diff --git a/cluster/manifests/flannel/daemonset.yaml b/cluster/manifests/flannel/daemonset.yaml index 327b794eea..dc5b35b0c3 100644 --- a/cluster/manifests/flannel/daemonset.yaml +++ b/cluster/manifests/flannel/daemonset.yaml @@ -100,7 +100,7 @@ spec: - /tc-flannel.sh command: - /bin/bash - image: container-registry.zalando.net/teapot/flannel-tc:master-10 + image: container-registry.zalando.net/teapot/flannel-tc:master-12 name: flannel-tc resources: requests: diff --git a/cluster/manifests/node-monitor/daemonset.yaml b/cluster/manifests/node-monitor/daemonset.yaml index 9d55d4f0a1..8f42f1c8c8 100644 --- a/cluster/manifests/node-monitor/daemonset.yaml +++ b/cluster/manifests/node-monitor/daemonset.yaml @@ -115,7 +115,7 @@ spec: mountPath: /host readOnly: true {{- if eq .Cluster.ConfigItems.journald_reader_enabled "true" }} - - image: container-registry.zalando.net/teapot/journald-reader:master-15 + - image: container-registry.zalando.net/teapot/journald-reader:master-17 name: journald-reader env: - name: JOURNALD_READER_CHECKPOINT_FILE diff --git a/test/e2e/loadtest/client/loadtest-deployment.yaml b/test/e2e/loadtest/client/loadtest-deployment.yaml index f7d8207d88..2b65785685 100644 --- a/test/e2e/loadtest/client/loadtest-deployment.yaml +++ b/test/e2e/loadtest/client/loadtest-deployment.yaml @@ -75,7 +75,7 @@ spec: value: "10" - name: DURATION value: "1h" - image: container-registry.zalando.net/teapot/calibrated-loadtest:master-2 + image: container-registry.zalando.net/teapot/calibrated-loadtest:master-4 imagePullPolicy: IfNotPresent name: e2e-vegeta resources: diff --git a/test/e2e/util.go b/test/e2e/util.go index 68141b2c59..c0c2667aae 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -897,7 +897,7 @@ func createVegetaDeployment(hostPath string, rate int) *appsv1.Deployment { Containers: []corev1.Container{ { Name: name, - Image: "container-registry.zalando.net/teapot/vegeta:v12.8.4-main-2", + Image: "container-registry.zalando.net/teapot/vegeta:v12.8.4-main-4", Command: []string{"sh", "-c"}, Args: []string{cmd}, Resources: corev1.ResourceRequirements{ From c817bebfde03f9ebd9eea9a2dc6fa2ee3821071d Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Tue, 28 May 2024 15:39:08 +0200 Subject: [PATCH 3/6] Update emergency-access-service to static base image Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/manifests/emergency-access-service/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/emergency-access-service/deployment.yaml b/cluster/manifests/emergency-access-service/deployment.yaml index 18688d90ce..6c583a936d 100644 --- a/cluster/manifests/emergency-access-service/deployment.yaml +++ b/cluster/manifests/emergency-access-service/deployment.yaml @@ -42,7 +42,7 @@ spec: cpu: 25m memory: 25Mi - name: emergency-access-service - image: "container-registry.zalando.net/teapot/emergency-access-service:master-88" + image: "container-registry.zalando.net/teapot/emergency-access-service:master-94" args: - --insecure-http - --community={{ .Cluster.Owner }} From 3c431ea8f287b719811798c97eca4aee3cd7f6ae Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Tue, 28 May 2024 16:55:41 +0200 Subject: [PATCH 4/6] Update etcd-proxy to use static base image Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/manifests/emergency-access-service/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/emergency-access-service/deployment.yaml b/cluster/manifests/emergency-access-service/deployment.yaml index 18688d90ce..ed032abac9 100644 --- a/cluster/manifests/emergency-access-service/deployment.yaml +++ b/cluster/manifests/emergency-access-service/deployment.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: emergency-access-service containers: - name: apiserver-proxy - image: container-registry.zalando.net/teapot/etcd-proxy:master-10 + image: container-registry.zalando.net/teapot/etcd-proxy:master-11 command: - /bin/sh args: From f60889df138bc21787cca81c41ebb0cc1fea1445 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Wed, 29 May 2024 17:56:04 +0200 Subject: [PATCH 5/6] explicitly set 1 replica for external-dns Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/manifests/external-dns/deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cluster/manifests/external-dns/deployment.yaml b/cluster/manifests/external-dns/deployment.yaml index 65124323d3..63eeca1da4 100644 --- a/cluster/manifests/external-dns/deployment.yaml +++ b/cluster/manifests/external-dns/deployment.yaml @@ -7,6 +7,7 @@ metadata: application: kubernetes component: external-dns spec: + replicas: 1 strategy: type: Recreate selector: From 651235702ce84479adfaebdcce427797112379eb Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Thu, 30 May 2024 09:44:38 +0200 Subject: [PATCH 6/6] update and revert broken dockerfiles to working versions --- cluster/manifests/etcd-backup/cronjob.yaml | 2 +- cluster/manifests/node-monitor/daemonset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/manifests/etcd-backup/cronjob.yaml b/cluster/manifests/etcd-backup/cronjob.yaml index 8df7a6427b..f04d3edc04 100644 --- a/cluster/manifests/etcd-backup/cronjob.yaml +++ b/cluster/manifests/etcd-backup/cronjob.yaml @@ -31,7 +31,7 @@ spec: restartPolicy: Never containers: - name: etcd-backup - image: container-registry.zalando.net/teapot/etcd-backup:master-26 + image: container-registry.zalando.net/teapot/etcd-backup:master-27 env: - name: ETCD_S3_BACKUP_BUCKET value: "{{ .Cluster.ConfigItems.etcd_s3_backup_bucket }}" diff --git a/cluster/manifests/node-monitor/daemonset.yaml b/cluster/manifests/node-monitor/daemonset.yaml index 8f42f1c8c8..9d55d4f0a1 100644 --- a/cluster/manifests/node-monitor/daemonset.yaml +++ b/cluster/manifests/node-monitor/daemonset.yaml @@ -115,7 +115,7 @@ spec: mountPath: /host readOnly: true {{- if eq .Cluster.ConfigItems.journald_reader_enabled "true" }} - - image: container-registry.zalando.net/teapot/journald-reader:master-17 + - image: container-registry.zalando.net/teapot/journald-reader:master-15 name: journald-reader env: - name: JOURNALD_READER_CHECKPOINT_FILE