From e87044845ac91f3c7fea2dcb978d66f183f932e8 Mon Sep 17 00:00:00 2001 From: 418 I'm a teapot Date: Mon, 23 Sep 2024 16:32:52 +0200 Subject: [PATCH 1/8] kubernetes-lifecycle-metrics: Update to version master-23 Update container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics to version master-23 --- cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml b/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml index faebf73779..350fb0f83c 100644 --- a/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml +++ b/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml @@ -31,7 +31,7 @@ spec: serviceAccountName: kubernetes-lifecycle-metrics containers: - name: kubernetes-lifecycle-metrics - image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-22" + image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-23" ports: - containerPort: 9090 protocol: TCP From cfa745856e39ecb4dfa26dd613ee93dbd3b64592 Mon Sep 17 00:00:00 2001 From: 418 I'm a teapot Date: Tue, 24 Sep 2024 09:53:20 +0200 Subject: [PATCH 2/8] skipper-canary-controller: Update to version main-22 Update container-registry.zalando.net/gwproxy/skipper-canary-controller to version main-22 --- cluster/manifests/skipper-canary-controller/canary-cronjob.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml b/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml index 497074766d..0a10c53e6d 100644 --- a/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml +++ b/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml @@ -25,7 +25,7 @@ spec: containers: - name: skipper-canary-controller terminationMessagePolicy: FallbackToLogsOnError - image: container-registry.zalando.net/gwproxy/skipper-canary-controller:main-21 + image: container-registry.zalando.net/gwproxy/skipper-canary-controller:main-22 env: - name: _PLATFORM_OBSERVABILITY_ACCESS_TOKEN valueFrom: From 2068e61855bb0c2eb535012d28e6f52a584c52e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandor=20Sz=C3=BCcs?= Date: Tue, 24 Sep 2024 12:58:34 +0200 Subject: [PATCH 3/8] fix: canary controller cronjob name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sandor Szücs --- cluster/manifests/deletions.yaml | 3 +++ .../manifests/skipper-canary-controller/canary-cronjob.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/manifests/deletions.yaml b/cluster/manifests/deletions.yaml index 2a224a70fd..ec55005a8f 100644 --- a/cluster/manifests/deletions.yaml +++ b/cluster/manifests/deletions.yaml @@ -304,3 +304,6 @@ post_apply: kind: RoleBinding namespace: kube-system {{ end }} +- name: skipper-canary-conrtroller + kind: CronJob + namespace: kube-system diff --git a/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml b/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml index 497074766d..e7bd987fe4 100644 --- a/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml +++ b/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: skipper-canary-conrtroller + name: skipper-canary-controller namespace: kube-system labels: application: skipper-ingress From 4af774ccc1ae7edf1251d8e5235ed6303dc78ce3 Mon Sep 17 00:00:00 2001 From: Alexander Yastrebov Date: Tue, 24 Sep 2024 17:02:05 +0200 Subject: [PATCH 4/8] ingress: log into both cluster and infra accounts It makes sense for ingress components to log into both cluster and infra accounts: * cluster logs enable correlation with skipper-ingress access logs and user application logs * infra logs enable correlation across clusters * ingress components typically do not produce large amount of logs (unlike skipper-ingress access logs) For pod-deletion-cost-controller save last chunk of logs into container status on error to simplify debugging. Signed-off-by: Alexander Yastrebov --- cluster/manifests/fabric-gateway/deployment.yaml | 2 +- .../manifests/skipper/hostname-credentials-controller.yaml | 2 +- .../manifests/skipper/pod-deletion-cost-controller.yaml | 7 +++++-- cluster/manifests/skipper/skipper-redis.yaml | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cluster/manifests/fabric-gateway/deployment.yaml b/cluster/manifests/fabric-gateway/deployment.yaml index bb1936d9e8..62c98bad1e 100644 --- a/cluster/manifests/fabric-gateway/deployment.yaml +++ b/cluster/manifests/fabric-gateway/deployment.yaml @@ -30,7 +30,7 @@ spec: annotations: kubernetes-log-watcher/scalyr-parser: | [{"container": "controller", "parser": "keyValue"}] - logging/destination: "{{ .Cluster.ConfigItems.log_destination_infra }}" + logging/destination: "{{ .Cluster.ConfigItems.log_destination_both }}" prometheus.io/path: /metrics prometheus.io/port: "7979" prometheus.io/scrape: "true" diff --git a/cluster/manifests/skipper/hostname-credentials-controller.yaml b/cluster/manifests/skipper/hostname-credentials-controller.yaml index d25227150e..6b2bc11d54 100644 --- a/cluster/manifests/skipper/hostname-credentials-controller.yaml +++ b/cluster/manifests/skipper/hostname-credentials-controller.yaml @@ -119,7 +119,7 @@ spec: annotations: kubernetes-log-watcher/scalyr-parser: | [{"container": "controller", "parser": "keyValue"}] - logging/destination: "{{ .Cluster.ConfigItems.log_destination_infra }}" + logging/destination: "{{ .Cluster.ConfigItems.log_destination_both }}" spec: serviceAccountName: hostname-credentials-controller restartPolicy: Never diff --git a/cluster/manifests/skipper/pod-deletion-cost-controller.yaml b/cluster/manifests/skipper/pod-deletion-cost-controller.yaml index a674aeee7b..3944affac3 100644 --- a/cluster/manifests/skipper/pod-deletion-cost-controller.yaml +++ b/cluster/manifests/skipper/pod-deletion-cost-controller.yaml @@ -20,6 +20,8 @@ spec: application: skipper-ingress component: pod-deletion-cost-controller deployment: pod-deletion-cost-controller + annotations: + logging/destination: "{{ .Cluster.ConfigItems.log_destination_both }}" spec: priorityClassName: "{{ .Cluster.ConfigItems.system_priority_class }}" serviceAccountName: pod-deletion-cost-controller @@ -29,12 +31,13 @@ spec: - -v={{ .Cluster.ConfigItems.skipper_pod_deletion_cost_controller_log_v }} - -poll-interval={{ .Cluster.ConfigItems.skipper_pod_deletion_cost_controller_poll_interval }} - -poll-timeout={{ .Cluster.ConfigItems.skipper_pod_deletion_cost_controller_poll_timeout }} -{{ if eq .Cluster.ConfigItems.skipper_pod_deletion_cost_controller_resync_enable "true" }} + # {{ if eq .Cluster.ConfigItems.skipper_pod_deletion_cost_controller_resync_enable "true" }} - -resync - -resync-interval={{ .Cluster.ConfigItems.skipper_pod_deletion_cost_controller_resync_interval }} -{{ end }} + # {{ end }} image: container-registry.zalando.net/gwproxy/pod-deletion-cost-controller:main-27 name: pod-deletion-cost-controller + terminationMessagePolicy: FallbackToLogsOnError ports: - containerPort: 8080 name: metrics diff --git a/cluster/manifests/skipper/skipper-redis.yaml b/cluster/manifests/skipper/skipper-redis.yaml index 89852cda25..1ff5f8cfff 100644 --- a/cluster/manifests/skipper/skipper-redis.yaml +++ b/cluster/manifests/skipper/skipper-redis.yaml @@ -22,7 +22,7 @@ spec: version: v7.2.4 annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "false" - logging/destination: "{{.Cluster.ConfigItems.log_destination_infra}}" + logging/destination: "{{ .Cluster.ConfigItems.log_destination_both }}" {{- if eq .Cluster.ConfigItems.skipper_topology_spread_enabled "true" }} zalando.org/topology-spread-timeout: 7m {{- end }} From 0d5b7ec1f751fda75b50278708662c3db31232ab Mon Sep 17 00:00:00 2001 From: 418 I'm a teapot Date: Wed, 25 Sep 2024 11:12:25 +0200 Subject: [PATCH 5/8] event-logger: Update to version master-17 Update container-registry.zalando.net/teapot/event-logger to version master-17 --- cluster/manifests/event-logger/statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/event-logger/statefulset.yaml b/cluster/manifests/event-logger/statefulset.yaml index 9c7adee864..a55c212382 100644 --- a/cluster/manifests/event-logger/statefulset.yaml +++ b/cluster/manifests/event-logger/statefulset.yaml @@ -30,7 +30,7 @@ spec: serviceAccountName: kubernetes-event-logger containers: - name: logger - image: container-registry.zalando.net/teapot/event-logger:master-16 + image: container-registry.zalando.net/teapot/event-logger:master-17 args: - --snapshot-namespace=kube-system - --snapshot-name=kubernetes-event-logger From 3c89c1aac8346825f7e29f9d960fb6e22fc57f8b Mon Sep 17 00:00:00 2001 From: 418 I'm a teapot Date: Wed, 25 Sep 2024 11:12:39 +0200 Subject: [PATCH 6/8] flannel-awaiter: Update to version master-15 Update container-registry.zalando.net/teapot/flannel-awaiter to version master-15 --- cluster/manifests/flannel/daemonset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/flannel/daemonset.yaml b/cluster/manifests/flannel/daemonset.yaml index 92f75d172b..2f2ff4ea52 100644 --- a/cluster/manifests/flannel/daemonset.yaml +++ b/cluster/manifests/flannel/daemonset.yaml @@ -37,7 +37,7 @@ spec: memory: 50Mi containers: - name: delayed-install-cni - image: container-registry.zalando.net/teapot/flannel-awaiter:master-14 + image: container-registry.zalando.net/teapot/flannel-awaiter:master-15 command: - /await stdin: true From c05df5c923fa6ea302c761e6ec2452fb21f2cd9c Mon Sep 17 00:00:00 2001 From: 418 I'm a teapot Date: Wed, 25 Sep 2024 11:13:28 +0200 Subject: [PATCH 7/8] kubernetes-lifecycle-metrics: Update to version master-24 Update container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics to version master-24 --- cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml b/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml index 350fb0f83c..0e41fec132 100644 --- a/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml +++ b/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml @@ -31,7 +31,7 @@ spec: serviceAccountName: kubernetes-lifecycle-metrics containers: - name: kubernetes-lifecycle-metrics - image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-23" + image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-24" ports: - containerPort: 9090 protocol: TCP From 6f3afc3d8498c8c4df6d3ee1294dd31519ed4f86 Mon Sep 17 00:00:00 2001 From: 418 I'm a teapot Date: Wed, 25 Sep 2024 11:14:02 +0200 Subject: [PATCH 8/8] spot-node-rescheduler: Update to version main-10 Update container-registry.zalando.net/teapot/spot-node-rescheduler to version main-10 --- cluster/manifests/spot-node-rescheduler/cronjob.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/spot-node-rescheduler/cronjob.yaml b/cluster/manifests/spot-node-rescheduler/cronjob.yaml index f6243b57ed..3a71cf32ff 100644 --- a/cluster/manifests/spot-node-rescheduler/cronjob.yaml +++ b/cluster/manifests/spot-node-rescheduler/cronjob.yaml @@ -24,7 +24,7 @@ spec: restartPolicy: Never containers: - name: spot-node-rescheduler - image: container-registry.zalando.net/teapot/spot-node-rescheduler:main-9 + image: container-registry.zalando.net/teapot/spot-node-rescheduler:main-10 resources: limits: cpu: "{{ .Cluster.ConfigItems.spot_node_rescheduler_cpu }}"