Merge pull request #7017 from zalando-incubator/dev-to-kube-1.26

dev to kube-1.26
zalando-incubator · Feb 20, 2024 · ce77cc6 · ce77cc6
2 parents b066baa + 1cf7e1c
commit ce77cc6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -160,6 +160,7 @@ skipper_ingress_redis_target_average_utilization_memory: "60"
 skipper_ingress_redis_min_replicas: "1"
 skipper_ingress_redis_max_replicas: "100"
 skipper_ingress_redis_cluster_scaling_schedules: ""
+skipper_ingress_redis_hpa_scale_down_wait: "600"
 
 skipper_cluster_ratelimit_max_group_shards: 1
 

diff --git a/cluster/manifests/deployment-service/controller-statefulset.yaml b/cluster/manifests/deployment-service/controller-statefulset.yaml
@@ -29,7 +29,7 @@ spec:
       terminationGracePeriodSeconds: 300
       containers:
         - name: "deployment-service-controller"
-          image: "container-registry.zalando.net/teapot/deployment-controller:master-169"
+          image: "container-registry.zalando.net/teapot/deployment-controller:master-172"
           args:
             - "--config-namespace=kube-system"
             - "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"

diff --git a/cluster/manifests/deployment-service/status-service-deployment.yaml b/cluster/manifests/deployment-service/status-service-deployment.yaml
@@ -1,5 +1,5 @@
 {{ $image   := "container-registry.zalando.net/teapot/deployment-status-service" }}
-{{ $version := "master-169" }}
+{{ $version := "master-172" }}
 
 apiVersion: apps/v1
 kind: Deployment

diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
@@ -1,4 +1,4 @@
-{{ $internal_version := "v0.19.53-804" }}
+{{ $internal_version := "v0.20.5-813" }}
 {{ $canary_internal_version := "v0.20.5-813" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}

diff --git a/cluster/manifests/skipper/hpa-redis.yaml b/cluster/manifests/skipper/hpa-redis.yaml
@@ -43,7 +43,7 @@ spec:
 {{ end }}
   behavior:
     scaleDown:
-      stabilizationWindowSeconds: 600
+      stabilizationWindowSeconds: {{ .Cluster.ConfigItems.skipper_ingress_redis_hpa_scale_down_wait }}
       policies:
       - type: Pods
         value: 10