minikube/k8s action improvement (#3251)

* Refactoring gitlab k8s action

* Uncommenting branches

Co-authored-by: Dubravko Sever <[email protected]>

Author: dsever

.github/workflows/k8s-testing.yml

@@ -2,11 +2,11 @@ name: k8s deployment
 on:
   pull_request_target:
   push:
-    branches:
-      - master
-      - dev
-      - release/**
-      - hotfix/**
+   branches:
+     - master
+     - dev
+     - release/**
+     - hotfix/**
 
 env:
   DD_DOCKER_REPO: defectdojo
@@ -133,7 +133,7 @@ jobs:
       - name: Setup Minikube
         uses: manusa/[email protected]
         with:
-          minikube version: 'v1.14.0'
+          minikube version: 'v1.14.2'
           kubernetes version: 'v1.19.2'
           driver: docker
           start args: '--addons=ingress'
@@ -151,6 +151,7 @@ jobs:
         run: |-
              helm repo add stable https://charts.helm.sh/stable
              helm repo add bitnami https://charts.bitnami.com/bitnami
+             helm dependency list ./helm/defectdojo
              helm dependency update ./helm/defectdojo
       - name: Set confings into Outputs
         id: set
@@ -181,27 +182,23 @@ jobs:
              kubectl get services
       - name: Check Application
         run: |-
+             to_complete () {
+               kubectl wait  --for=$1 $2 --timeout=500s --selector=$3
+               if [[ ${?} != 0 ]]; then
+                 echo "ERROR: $2"
+                 echo "INFO: status:"
+                 kubectl get pods
+                 echo "INFO: logs:"
+                 kubectl logs  --selector=$3
+               fi
+               return ${?}
+             }
              echo "Waiting for init job..."
-             kubectl wait  --for="condition=Complete" job --timeout=500s --selector=defectdojo.org/component=initializer
-             if [[ ${?} != 0 ]]; then
-               echo "ERROR: Init job"
-               kubectl logs    --selector=defectdojo.org/component=initializer
-               exit 1
-             fi
+             to_complete  "condition=Complete" job "defectdojo.org/component=initializer"
              echo "Waiting for celery pods..."
-             kubectl wait  --for=condition=ready  pod --timeout=500s --selector=defectdojo.org/component=celery
-             if [[ ${?} != 0 ]]; then
-               echo "ERROR: Celery "
-               kubectl logs --selector=defectdojo.org/component=celery
-               exit 1
-             fi
+             to_complete  "condition=ready" pod "defectdojo.org/component=celery"
              echo "Waiting for django pod..."
-             kubectl wait  --for=condition=ready  pod --timeout=500s --selector=defectdojo.org/component=django
-             if [[ ${?} != 0 ]];then
-               echo "ERROR: django "
-               kubectl logs  --selector=defectdojo.org/component=django -c uwsgi
-               exit 1
-             fi
+             to_complete  "condition=ready" pod "defectdojo.org/component=django"
              echo "Pods up and ready to rumbole"
              kubectl get pods
              OUT=$(kubectl run  curl --quiet=true --image=curlimages/curl:7.73.0 \