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/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 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/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 diff --git a/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml b/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml index faebf73779..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-22" + image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-24" ports: - containerPort: 9090 protocol: TCP diff --git a/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml b/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml index 497074766d..e5a7eb3f52 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 @@ -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: 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 }} 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 }}"