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

dev to kube-1.26

Author: gargravarr

cluster/config-defaults.yaml

@@ -37,7 +37,6 @@ karpenter_log_level: "error"
 kube_aws_ingress_controller_ssl_policy: "ELBSecurityPolicy-TLS-1-2-2017-01"
 kube_aws_ingress_controller_idle_timeout: "1m"
 kube_aws_ingress_controller_deregistration_delay_timeout: "10s"
-kube_aws_ingress_controller_ingress_version: "v1"
 # allow using NLBs for ingress
 # This opens skipper-ingress ports 9998 and 9999 on all worker nodes
 kube_aws_ingress_controller_nlb_enabled: "true"

cluster/manifests/ingress-controller/deployment.yaml

@@ -1,4 +1,4 @@
-# {{ $version := "v0.14.41" }}
+# {{ $version := "v0.15.5" }}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -56,7 +56,6 @@ spec:
             - --load-balancer-type={{ .Cluster.ConfigItems.kube_aws_ingress_default_lb_type }}
             # {{ end }}
             - --cert-polling-interval={{ .Cluster.ConfigItems.kube_aws_ingress_controller_cert_polling_interval }}
-            - --ingress-api-version=networking.k8s.io/{{ .Cluster.ConfigItems.kube_aws_ingress_controller_ingress_version }}
           env:
             - name: CUSTOM_FILTERS
               value: "tag:kubernetes.io/cluster/{{ .Cluster.ID }}=owned tag:node.kubernetes.io/role=worker tag:zalando.org/ingress-enabled=true"

cluster/manifests/skipper/deployment.yaml

@@ -1,4 +1,4 @@
-{{ $internal_version := "v0.19.44-795" }}
+{{ $internal_version := "v0.19.53-804" }}
 {{ $canary_internal_version := "v0.19.53-804" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}