Merge pull request #4798 from zalando-incubator/enable/ingress-v1-in-…

…test

enable: ingress v1 in test clusters

cluster/config-defaults.yaml

@@ -61,6 +61,11 @@ skipper_ingress_max_replicas: "50"
 skipper_ingress_min_replicas: "3"
 skipper_ingress_cpu: "1000m"
 skipper_ingress_memory: "1Gi"
+{{if eq .Cluster.Environment "production"}}
+skipper_ingress_kubernetes_ingress_v1: "false"
+{{else}}
+skipper_ingress_kubernetes_ingress_v1: "true"
+{{end}}
 enable_dedicate_nodepool_skipper: "false"
 skipper_suppress_route_update_logs: "true"
 {{if eq .Cluster.Environment "e2e"}}

cluster/manifests/skipper/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: kube-system
   labels:
     application: skipper-ingress
-    version: v0.13.137
+    version: v0.13.150
     component: ingress
 spec:
   strategy:
@@ -19,7 +19,7 @@ spec:
     metadata:
       labels:
         application: skipper-ingress
-        version: v0.13.137
+        version: v0.13.150
         component: ingress
       annotations:
         kubernetes-log-watcher/scalyr-parser: |
@@ -48,7 +48,7 @@ spec:
       hostNetwork: true
       containers:
       - name: skipper-ingress
-        image: registry.opensource.zalan.do/teapot/skipper-internal:v0.13.137-189
+        image: registry.opensource.zalan.do/teapot/skipper-internal:v0.13.150-202
         ports:
         - name: ingress-port
           containerPort: 9999
@@ -96,6 +96,7 @@ spec:
           - "-kubernetes"
           - "-kubernetes-in-cluster"
           - "-kubernetes-path-mode=path-prefix"
+          - "-kubernetes-ingress-v1={{ .Cluster.ConfigItems.skipper_ingress_kubernetes_ingress_v1 }}"
 {{ end }}
           - "-address=:9999"
           - "-wait-first-route-load"
@@ -155,7 +156,7 @@ spec:
             tag=application=skipper-ingress
             tag=account={{ .Cluster.Alias }}
             tag=cluster={{ .Cluster.Alias }}
-            tag=artifact=registry.opensource.zalan.do/teapot/skipper-internal:v0.13.137-189
+            tag=artifact=registry.opensource.zalan.do/teapot/skipper-internal:v0.13.150-202
             max-buffered-spans={{ .ConfigItems.skipper_ingress_tracing_buffer }}
             grpc-max-msg-size={{ .ConfigItems.skipper_ingress_lightstep_grpc_max_msg_size }}
             max-period={{ .ConfigItems.skipper_ingress_lightstep_max_period }}