From 9047208934a1f116cc517ffdbfc03d634226457c Mon Sep 17 00:00:00 2001
From: Flavius Lacatusu <flacatus@redhat.com>
Date: Wed, 3 Mar 2021 08:12:17 +0100
Subject: [PATCH] Fix minikube jobs. Run minikube latest stable version in
 tests (#695)

* Adopt github actions to work with embedded minikube

Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>
---
 .github/bin/minikube/provision-cluster.sh     | 81 -------------------
 .github/workflows/minikube-olm.yaml           | 18 +++--
 .../minikube-operator-singlehost.yaml         | 32 ++++++--
 .../workflows/minikube-operator-update.yaml   | 16 +++-
 .../workflows/minikube-stable-olm-update.yaml | 16 +++-
 5 files changed, 61 insertions(+), 102 deletions(-)
 delete mode 100755 .github/bin/minikube/provision-cluster.sh

diff --git a/.github/bin/minikube/provision-cluster.sh b/.github/bin/minikube/provision-cluster.sh
deleted file mode 100755
index e6c4fac2a..000000000
--- a/.github/bin/minikube/provision-cluster.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2012-2020 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-set -ex
-
-# Minikube environments config
-export MINIKUBE_VERSION=v1.8.2
-export KUBERNETES_VERSION=v1.16.2
-export MINIKUBE_HOME=$HOME
-export CHANGE_MINIKUBE_NONE_USER=true
-export KUBECONFIG=$HOME/.kube/config
-export TEST_OUTPUT=1
-
-sudo mount --make-rshared /
-sudo mount --make-rshared /proc
-sudo mount --make-rshared /sys
-
-# Download minikube binary
-curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/amd64/kubectl && \
-  chmod +x kubectl &&  \
-sudo mv kubectl /usr/local/bin/
-
-# Download minikube binary
-curl -Lo minikube https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-amd64 && \
-  chmod +x minikube && \
-  sudo mv minikube /usr/local/bin/
-
-# Create kube folder
-mkdir "${HOME}"/.kube || true
-touch "${HOME}"/.kube/config
-
-# minikube config
-minikube config set WantUpdateNotification false
-minikube config set WantReportErrorPrompt false
-minikube config set WantNoneDriverWarning false
-minikube config set vm-driver none
-minikube version
-
-# minikube start
-sudo minikube start --kubernetes-version=$KUBERNETES_VERSION --extra-config=kubelet.resolv-conf=/run/systemd/resolve/resolv.conf
-sudo chown -R $USER $HOME/.kube $HOME/.minikube
-
-minikube update-context
-
-#Give god access to the k8s API
-kubectl apply -f - <<EOF
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  name: cluster-reader
-rules:
-  - apiGroups: ["*"]
-    resources: ["*"]
-    verbs: ["get", "list", "watch"]
-  - nonResourceURLs: ["*"]
-    verbs: ["*"]
-EOF
-
-echo "[INFO] Enable ingress addon."
-sudo minikube addons enable ingress
-
-echo "[INFO] Enable registry addon."
-sudo minikube addons enable registry
-
-echo "[INFO] Minikube Addon list"
-sudo minikube addons  list
-
-echo "[INFO] Trying to get pod name of the registry proxy..."
-REGISTRY_PROXY_POD=$(sudo kubectl get pods -n kube-system -o yaml | grep  "name: registry-proxy-" | sed -e 's;.*name: \(\);\1;') || true
-echo "[INFO] Proxy pod name is ${REGISTRY_PROXY_POD}"
-sudo kubectl wait --for=condition=ready "pods/${REGISTRY_PROXY_POD}" --timeout=120s -n "kube-system" || true
-
-echo "[INFO] Minikube started!"
diff --git a/.github/workflows/minikube-olm.yaml b/.github/workflows/minikube-olm.yaml
index ee9f13f3b..6f130cd9b 100644
--- a/.github/workflows/minikube-olm.yaml
+++ b/.github/workflows/minikube-olm.yaml
@@ -15,15 +15,23 @@ on: pull_request
 jobs:
   minikube-e2e:
     name: Testing latest changes (olm installer)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
-    - name: Provision Minikube cluster
-      run:  /bin/bash .github/bin/minikube/provision-cluster.sh
-    - name: Install chectl
-      run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next
     - name: Install jq
       run: sudo pip install yq
+    - name: Provision Minikube cluster
+      run: |
+        minikube start --memory=6000mb
+    - name: Enable minikube addons
+      run: |
+        minikube addons enable ingress
+        minikube addons enable olm
+
+        # Enable registry and portfward to push images to registry
+        /bin/bash olm/minikube-registry-addon.sh &
+    - name: Install chectl
+      run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next
     - name: Run tests
       run: /bin/bash .github/bin/minikube/test-olm.sh
     # Run this step even the previous step fail
diff --git a/.github/workflows/minikube-operator-singlehost.yaml b/.github/workflows/minikube-operator-singlehost.yaml
index eb7be4740..382e07372 100644
--- a/.github/workflows/minikube-operator-singlehost.yaml
+++ b/.github/workflows/minikube-operator-singlehost.yaml
@@ -14,15 +14,23 @@ on: pull_request
 jobs:
   minikube-gateway:
     name: Testing latest changes (single-host/gateway)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
+    - name: Install yq
+      run: sudo pip install yq
     - name: Provision Minikube cluster
-      run:  /bin/bash .github/bin/minikube/provision-cluster.sh
+      run: |
+        minikube start --memory=6000mb
+    - name: Enable minikube addons
+      run: |
+        minikube addons enable ingress
+        minikube addons enable olm
+
+        # Enable registry and portfward to push images to registry
+        /bin/bash olm/minikube-registry-addon.sh &
     - name: Install chectl
       run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next
-    - name: Install jq
-      run: sudo pip install yq
     - name: Run tests
       run: /bin/bash .github/bin/minikube/test-operator-singlehost-gateway.sh
     # Run this step even the previous step fail to upload artifacts to GH
@@ -33,15 +41,23 @@ jobs:
         path: /tmp/artifacts-che
   minikube-native:
     name: Testing latest changes (single-host/native)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
+    - name: Install yq
+      run: sudo pip install yq
     - name: Provision Minikube cluster
-      run:  /bin/bash .github/bin/minikube/provision-cluster.sh
+      run: |
+        minikube start --memory=6000mb
+    - name: Enable minikube addons
+      run: |
+        minikube addons enable ingress
+        minikube addons enable olm
+
+        # Enable registry and portfward to push images to registry
+        /bin/bash olm/minikube-registry-addon.sh &
     - name: Install chectl
       run: bash <(curl -sL  https://www.eclipse.org/che/chectl/) --channel=next
-    - name: Install jq
-      run: sudo pip install yq
     - name: Run tests
       run: /bin/bash .github/bin/minikube/test-operator-singlehost-native.sh
     # Run this step even the previous step fail to upload artifacts to GH
diff --git a/.github/workflows/minikube-operator-update.yaml b/.github/workflows/minikube-operator-update.yaml
index e22297610..2fb8cd618 100644
--- a/.github/workflows/minikube-operator-update.yaml
+++ b/.github/workflows/minikube-operator-update.yaml
@@ -18,15 +18,23 @@ on:
 jobs:
   minikube:
     name: Test Eclipse Che update from stable to nightly
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
+    - name: Install yq
+      run: sudo pip install yq
     - name: Provision Minikube cluster
-      run:  /bin/bash .github/bin/minikube/provision-cluster.sh
+      run: |
+        minikube start --memory=6000mb
+    - name: Enable minikube addons
+      run: |
+        minikube addons enable ingress
+        minikube addons enable olm
+
+        # Enable registry and portfward to push images to registry
+        /bin/bash olm/minikube-registry-addon.sh &
     - name: Install chectl
       run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=stable
-    - name: Install jq
-      run: sudo pip install yq
     - name: Tests
       run: /bin/bash .github/bin/minikube/test-operator-update.sh
     # Run this step even the previous step fail
diff --git a/.github/workflows/minikube-stable-olm-update.yaml b/.github/workflows/minikube-stable-olm-update.yaml
index d32d1381f..1958cf845 100644
--- a/.github/workflows/minikube-stable-olm-update.yaml
+++ b/.github/workflows/minikube-stable-olm-update.yaml
@@ -18,15 +18,23 @@ on:
 jobs:
   minikube-e2e:
     name: Testing stable versions updates
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
+    - name: Install yq
+      run: sudo pip install yq
     - name: Provision Minikube cluster
-      run:  /bin/bash .github/bin/minikube/provision-cluster.sh
+      run: |
+        minikube start --memory=6000mb
+    - name: Enable minikube addons
+      run: |
+        minikube addons enable ingress
+        minikube addons enable olm
+
+        # Enable registry and portfward to push images to registry
+        /bin/bash olm/minikube-registry-addon.sh &
     - name: Install chectl
       run: bash <(curl -sL  https://www.eclipse.org/che/chectl/) --channel=stable
-    - name: Install jq
-      run: sudo pip install yq
     - name: Run tests
       run: /bin/bash .github/bin/minikube/test-stable-olm-update.sh
     # Run this step even the previous step fail