From d8e09189b66a75c093b1802c64be74d39f1d0f86 Mon Sep 17 00:00:00 2001
From: Maartje Eyskens <maartje@eyskens.me>
Date: Fri, 12 Jun 2020 10:52:44 +0200
Subject: [PATCH] Update the ingress

Signed-off-by: Maartje Eyskens <maartje@eyskens.me>
---
 devel/addon/ingressnginx/BUILD.bazel |  2 +-
 devel/addon/ingressnginx/install.sh  | 13 +++++++------
 test/e2e/images.bzl                  |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/devel/addon/ingressnginx/BUILD.bazel b/devel/addon/ingressnginx/BUILD.bazel
index c053d5563..ed436f248 100644
--- a/devel/addon/ingressnginx/BUILD.bazel
+++ b/devel/addon/ingressnginx/BUILD.bazel
@@ -3,7 +3,7 @@ load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
 container_bundle(
     name = "bundle",
     images = {
-        "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.29.0": "@io_kubernetes_ingress-nginx//image",
+        "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.33.0": "@io_kubernetes_ingress-nginx//image",
         "k8s.gcr.io/defaultbackend-amd64:bazel": "@io_gcr_k8s_defaultbackend//image",
     },
     tags = ["manual"],
diff --git a/devel/addon/ingressnginx/install.sh b/devel/addon/ingressnginx/install.sh
index 01a459bd0..de5e381cd 100755
--- a/devel/addon/ingressnginx/install.sh
+++ b/devel/addon/ingressnginx/install.sh
@@ -34,28 +34,29 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
 # Require helm available on PATH
 check_tool kubectl
 check_tool helm
-require_image "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.29.0" "//devel/addon/ingressnginx:bundle"
+require_image "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.33.0" "//devel/addon/ingressnginx:bundle"
 require_image "k8s.gcr.io/defaultbackend-amd64:bazel" "//devel/addon/ingressnginx:bundle"
 
 # Ensure the pebble namespace exists
 kubectl get namespace "${NAMESPACE}" || kubectl create namespace "${NAMESPACE}"
 
-helm repo add stable https://kubernetes-charts.storage.googleapis.com
+helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
 
 helm repo update
 
-# Upgrade or install Pebble
+# Upgrade or install nginx-ingress
 helm upgrade \
     --install \
     --wait \
-    --version 1.23.0 \
+    --version 2.4.0 \
     --namespace "${NAMESPACE}" \
-    --set controller.image.tag=0.29.0 \
+    --set controller.image.tag=0.33.0 \
     --set controller.image.pullPolicy=Never \
     --set defaultBackend.image.tag=bazel \
     --set defaultBackend.image.pullPolicy=Never \
     --set controller.service.clusterIP=10.0.0.15 \
     --set controller.service.type=ClusterIP \
     --set controller.config.no-tls-redirect-locations="" \
+    --set admissionWebhooks.enabled=false \
     "$RELEASE_NAME" \
-    stable/nginx-ingress
+    ingress-nginx/ingress-nginx
diff --git a/test/e2e/images.bzl b/test/e2e/images.bzl
index b2b09b566..f64e91efb 100644
--- a/test/e2e/images.bzl
+++ b/test/e2e/images.bzl
@@ -39,7 +39,7 @@ def install():
         name = "io_kubernetes_ingress-nginx",
         registry = "quay.io",
         repository = "kubernetes-ingress-controller/nginx-ingress-controller",
-        tag = "0.29.0",
+        tag = "0.33.0",
         # For some reason, the suggested sha256 returns an error when fetched from
         # quay.io by digest.
         # digest = "sha256:f7f08fdbbeddaf3179829c662da360a3feac1ecf8c4b1305949fffd8c8f59879",