Skip to content

Commit ce77cc6

Browse files
authored
Merge pull request #7017 from zalando-incubator/dev-to-kube-1.26
dev to kube-1.26
2 parents b066baa + 1cf7e1c commit ce77cc6

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

cluster/config-defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ skipper_ingress_redis_target_average_utilization_memory: "60"
160160
skipper_ingress_redis_min_replicas: "1"
161161
skipper_ingress_redis_max_replicas: "100"
162162
skipper_ingress_redis_cluster_scaling_schedules: ""
163+
skipper_ingress_redis_hpa_scale_down_wait: "600"
163164

164165
skipper_cluster_ratelimit_max_group_shards: 1
165166

cluster/manifests/deployment-service/controller-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
terminationGracePeriodSeconds: 300
3030
containers:
3131
- name: "deployment-service-controller"
32-
image: "container-registry.zalando.net/teapot/deployment-controller:master-169"
32+
image: "container-registry.zalando.net/teapot/deployment-controller:master-172"
3333
args:
3434
- "--config-namespace=kube-system"
3535
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"

cluster/manifests/deployment-service/status-service-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $image := "container-registry.zalando.net/teapot/deployment-status-service" }}
2-
{{ $version := "master-169" }}
2+
{{ $version := "master-172" }}
33

44
apiVersion: apps/v1
55
kind: Deployment

cluster/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ $internal_version := "v0.19.53-804" }}
1+
{{ $internal_version := "v0.20.5-813" }}
22
{{ $canary_internal_version := "v0.20.5-813" }}
33

44
{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}

cluster/manifests/skipper/hpa-redis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
{{ end }}
4444
behavior:
4545
scaleDown:
46-
stabilizationWindowSeconds: 600
46+
stabilizationWindowSeconds: {{ .Cluster.ConfigItems.skipper_ingress_redis_hpa_scale_down_wait }}
4747
policies:
4848
- type: Pods
4949
value: 10

0 commit comments

Comments
 (0)