Merge beta to beta-to-stable

zalando-incubator · Apr 5, 2022 · 7743e58 · 7743e58
2 parents b3295fe + 905f215
commit 7743e58
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/cluster/cluster.yaml b/cluster/cluster.yaml
@@ -1465,10 +1465,10 @@ Resources:
                 Effect: Allow
                 Resource: '*'
           {{if ne "" .Cluster.ConfigItems.zmon_accessible_s3_buckets}}
-              {{range $bucket := split "," .Cluster.ConfigItems.zmon_accessible_s3_buckets}}
+              {{range $bucket := split .Cluster.ConfigItems.zmon_accessible_s3_buckets ","}}
               - Action: 's3:GetObject'
                 Effect: Allow
-                Resource: '$bucket'
+                Resource: 'arn:aws:s3:::{{ $bucket }}/*'
               {{end}}
           {{end}}
               - Action: 'sqs:GetQueueAttributes'

diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -101,11 +101,13 @@ skipper_readiness_init_delay_seconds: 1
 skipper_liveness_init_delay_seconds: 30
 {{end}}
 # skipper termination settings
-# grace period needs to be >timeouts and healtcheck wait
-# wait for healtcheck needs to be <grace period and >skipper_idle_timeout_server
-skipper_termination_grace_period: "360"
-skipper_wait_for_healthcheck_interval: "355s"
+# (10s LB healthcheck interval) * (3 unhealthy threshold + margin of 1 interval)
+skipper_wait_for_healthcheck_interval: "40s"
+# (350s of fixed NLB connection idle timeout) + (margin of 2s)
 skipper_idle_timeout_server: "352s"
+# wait long enough for LB to detect unhealthy node and all connections become idle,
+# i.e. skipper_wait_for_healthcheck_interval + skipper_idle_timeout_server
+skipper_termination_grace_period: "392"
 
 # skipper redis settings
 enable_dedicate_nodepool_skipper_redis: "false"

diff --git a/cluster/manifests/prometheus/statefulset.yaml b/cluster/manifests/prometheus/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     application: kubernetes
     component: prometheus
-    version: v2.32.1
+    version: v2.34.0
 {{- if ne .ConfigItems.prometheus_csi_ebs "true" }}
   name: prometheus
 {{- else }}
@@ -26,7 +26,7 @@ spec:
         statefulset: prometheus
         application: kubernetes
         component: prometheus
-        version: v2.32.1
+        version: v2.34.0
       annotations:
         config/hash: {{"configmap.yaml" | manifestHash}}
         logging/destination: "{{.Cluster.ConfigItems.log_destination_infra}}"
@@ -63,7 +63,7 @@ spec:
           mountPath: /prometheus
       containers:
       - name: prometheus
-        image: registry.opensource.zalan.do/teapot/prometheus:v2.32.1
+        image: registry.opensource.zalan.do/teapot/prometheus:v2.34.0
         args:
         - "--config.file=/prometheus/prometheus.yaml"
         - "--storage.tsdb.path=/prometheus/"

diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml
@@ -200,7 +200,7 @@ write_files:
             requests:
               cpu: 100m
               memory: 200Mi
-        - image: registry.opensource.zalan.do/teapot/admission-controller:master-143
+        - image: registry.opensource.zalan.do/teapot/admission-controller:master-144
           name: admission-controller
           lifecycle:
             preStop: