From 612b448126fb0f8488d52d274c0755742ed0b3db Mon Sep 17 00:00:00 2001
From: geberl <github@dergeberl.de>
Date: Mon, 31 Aug 2020 16:15:15 +0200
Subject: [PATCH] update nginx-ingress to version v0.34.1

---
 acre.yaml                                            | 12 ++++++++++++
 .../chart/templates/00-ingress-controller.yaml       |  9 +++++----
 components/ingress-controller/deployment.yaml        |  3 +++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/acre.yaml b/acre.yaml
index 9e0dded3..8f9c0527 100644
--- a/acre.yaml
+++ b/acre.yaml
@@ -137,6 +137,18 @@ landscape:
       repo: (( .dependency_versions.versions.dashboard.core.repo ))
       tag: (( valid( branch ) -or valid( commit ) ? ~~ :.dependency_versions.versions.dashboard.core.version ))
       image_tag: (( valid( tag ) ? tag :~~ ))
+    ingress-controller:
+      <<: (( merge ))
+      repo: https://github.com/kubernetes/ingress-nginx.git
+      image_tag: (( valid( tag ) ? tag :~~ ))
+      image_repo: eu.gcr.io/k8s-artifacts-prod/ingress-nginx/controller
+      tag: (( valid( branch ) -or valid( commit ) ? ~~ :"v0.34.1" ))
+    nginx-ingress-k8s-backend:
+      <<: (( merge ))
+      repo: https://github.com/gardener/ingress-default-backend.git
+      image_tag: (( valid( tag ) ? tag :~~ ))
+      image_repo: eu.gcr.io/gardener-project/gardener/ingress-default-backend
+      tag: (( valid( branch ) -or valid( commit ) ? ~~ :"0.8.0" ))
     identity:
       <<: (( merge ))
       repo: (( .dependency_versions.versions.dashboard.identity.repo ))
diff --git a/components/ingress-controller/chart/templates/00-ingress-controller.yaml b/components/ingress-controller/chart/templates/00-ingress-controller.yaml
index 843d9dee..e89450b2 100644
--- a/components/ingress-controller/chart/templates/00-ingress-controller.yaml
+++ b/components/ingress-controller/chart/templates/00-ingress-controller.yaml
@@ -50,6 +50,7 @@ rules:
       - watch
   - apiGroups:
       - extensions
+      - "networking.k8s.io"
     resources:
       - ingresses
     verbs:
@@ -169,7 +170,7 @@ spec:
       priorityClassName: system-cluster-critical
       containers:
         - name: {{ .Values.name }}
-          image: quay.io/kubernetes-ingress-controller/{{ .Values.name }}:0.20.0
+          image: {{ index .Values.images "nginx-ingress" }}
           imagePullPolicy: "IfNotPresent"
           args:
           - /{{ .Values.name }}
@@ -187,8 +188,8 @@ spec:
                 - ALL
                 add:
                 - NET_BIND_SERVICE
-            # www-data -> 33
-            runAsUser: 33
+            # www-data -> 101
+            runAsUser: 101
           env:
           - name: POD_NAME
             valueFrom:
@@ -302,7 +303,7 @@ spec:
         fsGroup: 65534
       containers:
         - name: nginx-ingress-k8s-backend
-          image: eu.gcr.io/gardener-project/gardener/ingress-default-backend:0.7.0
+          image: {{ index .Values.images "ingress-k8s-backend" }}
           imagePullPolicy: "IfNotPresent"
           args:
           livenessProbe:
diff --git a/components/ingress-controller/deployment.yaml b/components/ingress-controller/deployment.yaml
index 2f6ffe2f..c86d1d1a 100644
--- a/components/ingress-controller/deployment.yaml
+++ b/components/ingress-controller/deployment.yaml
@@ -37,3 +37,6 @@ ingresscontroller:
     name: (( .ingresscontroller.name ))
     dns: (( "*." .settings.ingress_domain ))
     dnsclass: (( imports.dns-controller.export.dns-class ))
+    images:
+        nginx-ingress: (( .landscape.versions.ingress-controller.image_repo ":" .landscape.versions.ingress-controller.image_tag ))
+        ingress-k8s-backend: (( .landscape.versions.nginx-ingress-k8s-backend.image_repo ":" .landscape.versions.nginx-ingress-k8s-backend.image_tag ))
\ No newline at end of file