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

dev to kube-1.26

Author: mikkeloscar

cluster/config-defaults.yaml

@@ -888,13 +888,8 @@ stackset_routegroup_support_enabled: "true"
 stackset_ingress_source_switch_ttl: "5m"
 
 # enable/disable versioned configuration resources support for stackset
-{{if eq .Cluster.Environment "production"}}
-stackset_configmap_support_enabled: "false"
-stackset_secret_support_enabled: "false"
-{{else}}
 stackset_configmap_support_enabled: "true"
 stackset_secret_support_enabled: "true"
-{{end}}
 
 # enable/disable traffic segment support for stackset
 stackset_enable_traffic_segments: "false"

cluster/manifests/skipper/deployment.yaml

@@ -1,5 +1,5 @@
 {{ $internal_version := "v0.19.53-804" }}
-{{ $canary_internal_version := "v0.19.53-804" }}
+{{ $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" */}}
 {{ $canary_args := "" }}