From e23a6b6aa72e6462be316454636ffbe8802ed927 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 2 Dec 2020 10:24:23 -0300
Subject: [PATCH] Update kindest image

---
 .github/workflows/ci.yaml  | 4 ++--
 build/dev-env.sh           | 2 +-
 test/e2e/run-chart-test.sh | 2 +-
 test/e2e/run.sh            | 7 +------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bdbeafde2..0de5cdba5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -123,7 +123,7 @@ jobs:
         uses: engineerd/setup-kind@v0.5.0
         with:
           version: v0.9.0
-          image: kindest/node:v1.18.8
+          image: kindest/node:v1.19.4
 
       - name: Test
         env:
@@ -144,7 +144,7 @@ jobs:
 
     strategy:
       matrix:
-        k8s: [v1.16.15, v1.17.11, v1.18.8, v1.19.1]
+        k8s: [v1.16.15, v1.17.11, v1.18.8, v1.19.4]
 
     steps:
 
diff --git a/build/dev-env.sh b/build/dev-env.sh
index 08ead352b..d21ffb241 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -61,7 +61,7 @@ echo "[dev-env] building image"
 make build image
 docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}"
 
-export K8S_VERSION=${K8S_VERSION:-v1.19.0@sha256:3b0289b2d1bab2cb9108645a006939d2f447a10ad2bb21919c332d06b548bbc6}
+export K8S_VERSION=${K8S_VERSION:-v1.19.4@sha256:796d09e217d93bed01ecf8502633e48fd806fe42f9d02fdd468b81cd4e3bd40b}
 
 KIND_CLUSTER_NAME="ingress-nginx-dev"
 
diff --git a/test/e2e/run-chart-test.sh b/test/e2e/run-chart-test.sh
index 267c2ac7b..88ae163e8 100755
--- a/test/e2e/run-chart-test.sh
+++ b/test/e2e/run-chart-test.sh
@@ -56,7 +56,7 @@ fi
 if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
   echo "[dev-env] creating Kubernetes cluster with kind"
 
-  export K8S_VERSION=${K8S_VERSION:-v1.19.1@sha256:98cf5288864662e37115e362b23e4369c8c4a408f99cbc06e58ac30ddc721600}
+  export K8S_VERSION=${K8S_VERSION:-v1.19.4@sha256:796d09e217d93bed01ecf8502633e48fd806fe42f9d02fdd468b81cd4e3bd40b}
 
   kind create cluster \
     --verbosity=${KIND_LOG_LEVEL} \
diff --git a/test/e2e/run.sh b/test/e2e/run.sh
index dee4d28fc..956df3f1a 100755
--- a/test/e2e/run.sh
+++ b/test/e2e/run.sh
@@ -64,7 +64,7 @@ export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}"
 if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
   echo "[dev-env] creating Kubernetes cluster with kind"
 
-  export K8S_VERSION=${K8S_VERSION:-v1.19.1@sha256:98cf5288864662e37115e362b23e4369c8c4a408f99cbc06e58ac30ddc721600}
+  export K8S_VERSION=${K8S_VERSION:-v1.19.4@sha256:796d09e217d93bed01ecf8502633e48fd806fe42f9d02fdd468b81cd4e3bd40b}
 
   kind create cluster \
     --verbosity=${KIND_LOG_LEVEL} \
@@ -87,9 +87,6 @@ if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
   make -C ${DIR}/../e2e-image image
 fi
 
-#make -C ${DIR}/../../images/fastcgi-helloserver/ build image
-#make -C ${DIR}/../../images/echo/ image
-
 # Preload images used in e2e tests
 KIND_WORKERS=$(kind get nodes --name="${KIND_CLUSTER_NAME}" | grep worker | awk '{printf (NR>1?",":"") $1}')
 
@@ -97,8 +94,6 @@ echo "[dev-env] copying docker images to cluster..."
 
 kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} nginx-ingress-controller:e2e
 kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/controller:${TAG}
-#kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/fastcgi-helloserver:${TAG}
-#kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/echo:${TAG}
 
 echo "[dev-env] running e2e tests..."
 make -C ${DIR}/../../ e2e-test