Fix for GKE CI pipeline (#5428)

* Fix for ChartMuseum in GKE

Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com>

* Add wait for LB ip

Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com>

* Added check for missing chart museum IP

Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com>

* Set branch back to prerelease

Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com>

* Update script/install-nginx.sh

Co-authored-by: Jesús Miguel Benito Calzada <bjesus@vmware.com>
Signed-off-by: Rafa Castelblanque <67455978+castelblanque@users.noreply.github.com>

Signed-off-by: Rafa Castelblanque <rcastelblanq@vmware.com>
Signed-off-by: Rafa Castelblanque <67455978+castelblanque@users.noreply.github.com>
Co-authored-by: Jesús Miguel Benito Calzada <bjesus@vmware.com>

Author: castelblanque

.circleci/config.yml

@@ -591,6 +591,7 @@ gke_test: &gke_test
         name: Apply customizations to GKE cluster
         command: |
           kubectl create namespace kubeapps-user-namespace
+          ./script/install-nginx.sh
     - <<: *run_e2e_tests
     - store_artifacts:
         path: integration/reports

script/chart-museum.sh

@@ -8,7 +8,7 @@ CHARTMUSEUM_PWD=${CHARTMUSEUM_PWD:-"password"}
 CHARTMUSEUM_NS=${CHARTMUSEUM_NS:-"chart-museum"}
 CHARTMUSEUM_VERSION=${CHARTMUSEUM_VERSION:-"3.9.0"}
 CHARTMUSEUM_HOSTNAME=${CHARTMUSEUM_HOSTNAME:-"chart-museum"}
-CHARTMUSEUM_IP=${DEX_IP}
+CHARTMUSEUM_IP=${LOAD_BALANCER_IP}
 
 # Pull a Bitnami chart to a local TGZ file
 # Arguments:
@@ -58,6 +58,11 @@ pushChartToChartMuseum() {
   local CHART_VERSION=$2
   local CHART_FILE=$3
 
+  if [[ -z "${CHARTMUSEUM_IP}" ]]; then
+    echo "ChartMuseum ingress IP has not been defined in variable CHARTMUSEUM_IP"
+    exit 1
+  fi
+
   echo ">> Pushing chart '${CHART_FILE}' (${CHART_NAME} v${CHART_VERSION}) to chart museum at ${CHARTMUSEUM_HOSTNAME} and IP ${CHARTMUSEUM_IP}"
   CHART_EXISTS=$(curl -Lk -u "${CHARTMUSEUM_USER}:${CHARTMUSEUM_PWD}" -H "Host: ${CHARTMUSEUM_HOSTNAME}" http://${CHARTMUSEUM_IP}/api/charts/${CHART_NAME}/${CHART_VERSION} | jq -r 'any([ .error] ; . > 0)')
   if [ "$CHART_EXISTS" == "true" ]; then

script/e2e-test.sh

@@ -34,6 +34,13 @@ fi
 # shellcheck disable=SC1090
 . "${ROOT_DIR}/script/lib/libutil.sh"
 
+# Get the load balancer IP
+if [[ -z "${GKE_BRANCH-}" ]]; then
+  LOAD_BALANCER_IP=$DEX_IP
+else
+  LOAD_BALANCER_IP=$(kubectl -n nginx-ingress get service nginx-ingress-ingress-nginx-controller -o jsonpath="{.status.loadBalancer.ingress[].ip}")
+fi
+
 # Functions for local Docker registry mgmt
 . "${ROOT_DIR}/script/local-docker-registry.sh"
 
@@ -49,6 +56,7 @@ info "Image modifier: ${IMG_MODIFIER}"
 info "Image prefix: ${IMG_PREFIX}"
 info "Dex IP: ${DEX_IP}"
 info "Additional cluster IP : ${ADDITIONAL_CLUSTER_IP}"
+info "Load balancer IP : ${LOAD_BALANCER_IP}"
 info "Test timeout minutes: ${TEST_TIMEOUT_MINUTES}"
 info "Kapp Controller version: ${KAPP_CONTROLLER_VERSION}"
 info "Cluster Version: $(kubectl version -o json | jq -r '.serverVersion.gitVersion')"

script/install-nginx.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Copyright 2018-2022 the Kubeapps contributors.
+# SPDX-License-Identifier: Apache-2.0
+
+set -euo pipefail
+
+echo "Instaling Nginx"
+helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
+helm repo update
+helm install -n nginx-ingress --create-namespace nginx-ingress ingress-nginx/ingress-nginx
+
+# Wait for load balancer to get the IP
+LB_IP=""
+while [ -z $LB_IP ]; do
+  echo "Waiting for external IP"
+  LB_IP=$(kubectl -n nginx-ingress get service nginx-ingress-ingress-nginx-controller --template="{{range .status.loadBalancer.ingress}}{{.ip}}{{end}}")
+  [ -z "$LB_IP" ] && sleep 10
+done
+echo 'Load balancer got IP assigned: '$LB_IP