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

dev to kube-1.26

Author: gargravarr

cluster/manifests/skipper/deployment.yaml

@@ -209,8 +209,8 @@ spec:
 {{ else }}
           - "-kubernetes-redis-service-namespace=kube-system"
           - "-kubernetes-redis-service-name=skipper-ingress-redis"
-{{ end }}
           - "-kubernetes-redis-service-port=6379"
+{{ end }}
 {{ end }}
           - "-histogram-metric-buckets=.0001,.00025,.0005,.00075,.001,.0025,.005,.0075,.01,.025,.05,.075,.1,.2,.3,.4,.5,.75,1,2,3,4,5,7,10,15,20,30,60,120,300,600"
           - >-
@@ -538,6 +538,7 @@ spec:
           - "-enable-swarm"
           - "-kubernetes-redis-service-namespace=kube-system"
           - "-kubernetes-redis-service-name=skipper-ingress-redis"
+          - "-kubernetes-redis-service-port=6379"
 {{ end }}
 {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
           - "-enable-oauth2-grant-flow"

cluster/manifests/stackset-controller/deployment.yaml

@@ -1,4 +1,4 @@
-{{ $version := "v1.4.33" }}
+{{ $version := "v1.4.34" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

cluster/node-pools/master-default/userdata.yaml

@@ -601,7 +601,7 @@ write_files:
           - --root-ca-file=/etc/kubernetes/ssl/ca.pem
           - --cloud-provider=aws
           - --cloud-config=/etc/kubernetes/cloud-config.ini
-          - --feature-gates=StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},CronJobTimeZone={{.Cluster.ConfigItems.cronjob_time_zone_enabled}}
+          - --feature-gates=StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},CronJobTimeZone={{.Cluster.ConfigItems.cronjob_time_zone_enabled}},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}
           - --use-service-account-credentials=true
           - --configure-cloud-routes=false
           - --allocate-node-cidrs=true

test/e2e/stackset/go.mod

@@ -2,7 +2,7 @@ module github.com/zalando-incubator/kubernetes-on-aws/test/e2e/stackset
 
 go 1.21
 
-require github.com/zalando-incubator/stackset-controller v1.4.33
+require github.com/zalando-incubator/stackset-controller v1.4.34
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect

test/e2e/stackset/go.sum

@@ -493,8 +493,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zalando-incubator/stackset-controller v1.4.33 h1:DkbUxlROutOnBrBgg5VuPnXoUmABH2iH830WO36Fy5Y=
-github.com/zalando-incubator/stackset-controller v1.4.33/go.mod h1:1BOmpWXc2sG7jQ9pM1orQSR8ngUaRZUguAx0SBTdC2k=
+github.com/zalando-incubator/stackset-controller v1.4.34 h1:TvdTvVGzkOakCI3W9CABbLVFArsNkBZiV40tPQ/f19I=
+github.com/zalando-incubator/stackset-controller v1.4.34/go.mod h1:1BOmpWXc2sG7jQ9pM1orQSR8ngUaRZUguAx0SBTdC2k=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=