Merge pull request #8305 from zalando-incubator/dev-to-eks

dev to eks
zalando-incubator · Oct 8, 2024 · 408ae38 · 408ae38
2 parents 4533630 + c3189bc
commit 408ae38
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -239,7 +239,7 @@ skipper_pod_deletion_cost_controller_log_v: "0"
 skipper_pod_deletion_cost_controller_poll_interval: "10s"
 skipper_pod_deletion_cost_controller_poll_timeout: "60s"
 # enable re-sync
-skipper_pod_deletion_cost_controller_resync_enable: "false"
+skipper_pod_deletion_cost_controller_resync_enable: "true"
 skipper_pod_deletion_cost_controller_resync_interval: "1h"
 
 # polarsignals - only enabled for testing teapot

diff --git a/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml b/cluster/manifests/skipper-canary-controller/canary-cronjob.yaml
@@ -36,10 +36,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
             - name: _PLATFORM_OBSERVABILITY_ACCESS_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: skipper-ingress
-                  key: lightstep-token
+              value: "{{ .Cluster.ConfigItems.lightstep_token }}"
             - name: _PLATFORM_OBSERVABILITY_COLLECTOR_SCHEME
               value: "{{ .Cluster.ConfigItems.observability_collector_scheme }}"
             - name: _PLATFORM_OBSERVABILITY_COLLECTOR_PORT
@@ -54,6 +51,16 @@ spec:
               value: "{{ .Cluster.Alias }}"
             - name: _PLATFORM_OBSERVABILITY_COMMON_ATTRIBUTE_CLOUD__ACCOUNT__ID
               value: "{{ .Cluster.Alias }}"
+            - name: _PLATFORM_CLUSTER_ID
+              value: "{{ .Cluster.ID }}"
+            - name: _PLATFORM_OPENTRACING_TAG_ACCOUNT
+              value: "{{ .Cluster.Alias }}"
+            - name: _PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_PORT
+              value: "8443"
+            - name: _PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_HOST
+              value: "{{ .Cluster.ConfigItems.tracing_collector_host }}"
+            - name: _PLATFORM_OPENTRACING_LIGHTSTEP_ACCESS_TOKEN
+              value: "{{ .Cluster.ConfigItems.lightstep_token }}"
             - name: LIGHTSTEP_DEBUG
               value: "true"
             args:

diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
@@ -1,7 +1,7 @@
 {{/* image-updater-bot detects *image variables so use print to disable it for main image */}}
 
 {{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.211-1033" }}
-{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.212-1034" }}
+{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.216-1038" }}
 
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}

diff --git 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-216
+        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-219
           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.212
+          image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.216
           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.212
+          image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.216
           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.212
+          image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.21.216
           args:
           - skipper
           - -access-log-strip-query