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

dev to kube-1.26

Author: RomanZavodskikh

cluster/config-defaults.yaml

@@ -64,9 +64,11 @@ skipper_ingress_hpa_scale_up_max_perc: "100"
 {{if eq .Cluster.Environment "production"}}
 skipper_ingress_min_replicas: "3"
 skipper_ingress_max_replicas: "300"
+skipper_ingress_passive_health_check_options: ""
 {{else}}
 skipper_ingress_min_replicas: "2"
 skipper_ingress_max_replicas: "50"
+skipper_ingress_passive_health_check_options: "period=10s,min-requests=10,max-drop-probability=0.9"
 {{end}}
 skipper_ingress_cpu: "1000m"
 skipper_ingress_memory: "1500Mi"

cluster/manifests/skipper/deployment.yaml

@@ -1,5 +1,5 @@
 {{ $internal_version := "v0.20.15-824" }}
-{{ $canary_internal_version := "v0.20.15-824" }}
+{{ $canary_internal_version := "v0.21.4-831" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
 {{ $canary_args := "" }}
@@ -301,6 +301,9 @@ spec:
 {{ if .Cluster.ConfigItems.skipper_ingress_inline_routes }}
           - "-inline-routes={{ .Cluster.ConfigItems.skipper_ingress_inline_routes }}"
 {{ end }}
+{{ if and (.Cluster.ConfigItems.skipper_ingress_passive_health_check_options) (eq .name "skipper-ingress-canary") }}
+          - "-passive-health-check={{ .Cluster.ConfigItems.skipper_ingress_passive_health_check_options }}"
+{{ end }}
 {{ if .Cluster.ConfigItems.skipper_ingress_refuse_payload }}
           {{ range $pattern := split .Cluster.ConfigItems.skipper_ingress_refuse_payload "[cf724afc]" }}
           - "-refuse-payload={{ $pattern }}"