From 811bea303eb67f8058e4dd327bbabd3b3f22b745 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Wed, 5 Jul 2023 16:58:38 +0300
Subject: [PATCH 01/10] deploy integration TK for develop cluster

---
 ...m-deploy-testkube-charts-stage-commit.yaml | 56 ++++++++---------
 .../helm-deploy-testkube-charts-stage.yaml    | 60 +++++++++----------
 charts/testkube/values-stage.yaml             | 16 ++---
 3 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index c88e232ce..0dee44080 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -1,6 +1,6 @@
 name: Releasing Testkube Helm charts to Stage k8s Cluster.
 
-concurrency: staging_cluster
+concurrency: develop_cluster
 
 on:
   push:
@@ -11,9 +11,9 @@ on:
 
 env:
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER_NAME_STAGE: ${{ secrets.GKE_CLUSTER_NAME_STAGE }} # Add your cluster name here.
-  GKE_ZONE_STAGE: ${{ secrets.GKE_ZONE_STAGE }} # Add your cluster zone here.
-  DEPLOYMENT_NAME: testkube # Add your deployment name here.
+  GKE_CLUSTER_NAME: ${{ secrets.GKE_CLUSTER_NAME_DEVELOP }} # Add your cluster name here.
+  GKE_ZONE: ${{ secrets.GKE_ZONE_DEVELOP }} # Add your cluster zone here.
+  DEPLOYMENT_NAME: testkube-integration # Add your deployment name here.
   ENV: stage
 
 
@@ -40,8 +40,8 @@ jobs:
 
       - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
-          cluster_name: ${{ env.GKE_CLUSTER_NAME_STAGE }}
-          location: ${{ env.GKE_ZONE_STAGE }}
+          cluster_name: ${{ env.GKE_CLUSTER_NAME }}
+          location: ${{ env.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: Install Helm
@@ -63,19 +63,19 @@ jobs:
       - name: Deploy helm chart to Integration Cluster
         run: |
           helm dependency update ./charts/testkube
-          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }}
+          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
 
   notify_slack_if_deploy_stage_succeeds:
     runs-on: ubuntu-latest
     needs: release_charts_if_image_updated
     steps:
-      - name: Slack Notification if the helm release deployment to ${{ env.ENV }} GKS succeeded.
+      - name: Slack Notification if the helm release deployment to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace succeeded.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.release_charts_if_image_updated.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Helm chart release successfully deployed into ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE :party_blob:!
+          SLACK_TITLE: Helm chart release successfully deployed to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace :party_blob:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -86,13 +86,13 @@ jobs:
     needs: release_charts_if_image_updated
     if: always() && (needs.release_charts_if_image_updated.result == 'failure')
     steps:
-      - name: Slack Notification if the helm release deployment to ${{ env.ENV }} GKS failed.
+      - name: Slack Notification if the helm release deployment to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace failed.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.release_charts_if_image_updated.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Helm chart release failed to deploy into ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE! :boom:!
+          SLACK_TITLE: Helm chart release failed to deploy to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace :boom:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -117,12 +117,12 @@ jobs:
       # Get the GKE credentials so we can deploy to the cluster
       - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
-          cluster_name: ${{ env.GKE_CLUSTER_NAME_STAGE }}
-          location: ${{ env.GKE_ZONE_STAGE }}
+          cluster_name: ${{ env.GKE_CLUSTER_NAME }}
+          location: ${{ env.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: Install testkube kubectl plugin and disable telemetry
-        run: bash <(curl -sSLf https://get.testkube.io) beta && kubectl testkube disable telemetry
+        run: bash <(curl -sSLf https://get.testkube.io) beta && kubectl testkube disable telemetry --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: Checkout tests from main Testkube repo
         uses: actions/checkout@v3
@@ -132,50 +132,50 @@ jobs:
 
       - name: Executor tests - delete/create/schedule all executor tests
         working-directory: ./testkube-repo
-        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s # (delete, create, schedule) - don't execute
+        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s # (delete, create, schedule) - don't execute ## needs optional namespace
 
       - name: (Re)create Postman Sanity test (with CLI)
         working-directory: ./testkube-repo
         run: |-
           # enabling debug mode
           set -x
-          kubectl -n testkube delete test sanity --ignore-not-found=true
-          kubectl -n testkube delete secret sanity-secrets --ignore-not-found=true
-          kubectl testkube create test -f ./test/postman/TestKube-Sanity.postman_collection.json --name sanity --type postman/collection -v api_uri=http://testkube-api-server:8088 -v test_api_uri=http://testkube-api-server:8088 -v test_type=postman/collection -v test_name=fill-me -v execution_name=fill-me
+          kubectl delete test sanity --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl delete secret sanity-secrets --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl testkube create test -f ./test/postman/TestKube-Sanity.postman_collection.json --name sanity --type postman/collection -v api_uri=http://testkube-api-server:8088 -v test_api_uri=http://testkube-api-server:8088 -v test_type=postman/collection -v test_name=fill-me -v execution_name=fill-me --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: Run Postman sanity tests
-        run: kubectl testkube run test sanity -f --git-branch develop
+        run: kubectl testkube run test sanity -f --git-branch develop --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: (Re)create Dashboard E2E tests (from CRD)
         working-directory: ./testkube-repo
         run: |-
           # enabling debug mode
           set -x
-          kubectl -n testkube delete test dashboard-e2e-tests --ignore-not-found=true
-          kubectl apply -f ./test/dashboard-e2e/crd/crd.yaml
+          kubectl delete test dashboard-e2e-tests --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl apply -f ./test/dashboard-e2e/crd/crd.yaml --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: (Re)create staging testsuite
         working-directory: ./testkube-repo
         run: |-
           # enabling debug mode
           set -x
-          kubectl -n testkube delete testsuite staging-testsuite --ignore-not-found=true
-          kubectl testkube create testsuite -f ./test/suites/staging-testsuite.json --name staging-testsuite
+          kubectl delete testsuite staging-testsuite --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl testkube create testsuite -f ./test/suites/staging-testsuite.json --name staging-testsuite --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: Run staging testsuite
-        run: kubectl testkube run testsuite staging-testsuite -f --git-branch develop
+        run: kubectl testkube run testsuite staging-testsuite -f --git-branch develop --namespace ${{ env.DEPLOYMENT_NAME }}
 
   notify_slack_if_test_suite_stage_succeeds:
     runs-on: ubuntu-latest
     needs: test_suite_run_stage
     steps:
-      - name: Slack Notification if the test suite run on STAGE GKS succeeded.
+      - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace succeeded.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Test suite successfully run against ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE :party_blob:!
+          SLACK_TITLE: Test suite successfully run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace :party_blob:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -186,13 +186,13 @@ jobs:
     needs: test_suite_run_stage
     if: always() && (needs.test_suite_run_stage.result == 'failure')
     steps:
-      - name: Slack Notification if the test suite run on ${{ env.ENV }} GKS failed.
+      - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace failed.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Test suite FAILED to run on ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE! :boom:!
+          SLACK_TITLE: Test suite FAILED to run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace! :boom:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/helm-deploy-testkube-charts-stage.yaml b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
index 34d2a9eb5..affa360e9 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
@@ -1,6 +1,6 @@
 name: Releasing Testkube Helm charts to Stage k8s Cluster.
 
-concurrency: staging_cluster
+concurrency: develop_cluster
 
 on:
   repository_dispatch:
@@ -13,9 +13,9 @@ on:
 
 env:
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER_NAME_STAGE: ${{ secrets.GKE_CLUSTER_NAME_STAGE }} # Add your cluster name here.
-  GKE_ZONE_STAGE: ${{ secrets.GKE_ZONE_STAGE }} # Add your cluster zone here.
-  DEPLOYMENT_NAME: testkube # Add your deployment name here.
+  GKE_CLUSTER_NAME: ${{ secrets.GKE_CLUSTER_NAME_DEVELOP }} # Add your cluster name here.
+  GKE_ZONE: ${{ secrets.GKE_ZONE_DEVELOP }} # Add your cluster zone here.
+  DEPLOYMENT_NAME: testkube-integration # Add your deployment name here.
   ENV: stage
 
 
@@ -42,8 +42,8 @@ jobs:
 
       - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
-          cluster_name: ${{ env.GKE_CLUSTER_NAME_STAGE }}
-          location: ${{ env.GKE_ZONE_STAGE }}
+          cluster_name: ${{ env.GKE_CLUSTER_NAME }}
+          location: ${{ env.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: Install Helm
@@ -94,31 +94,31 @@ jobs:
         if: ${{ github.event.client_payload.image_tag_api }}
         run: |
           helm dependency update ./charts/testkube
-          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-api.image.tag=${{ github.event.client_payload.image_tag_api }} --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }}
+          helm upgrade --debug --install --atomic --timeout 180s testkube ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-api.image.tag=${{ github.event.client_payload.image_tag_api }} --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
 
       - name: Deploy if Testkube Dashboard image is updated
         if: ${{ github.event.client_payload.image_tag_dashboard }}
         run: |
           helm dependency update ./charts/testkube
-          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-dashboard.image.tag=${{ github.event.client_payload.image_tag_dashboard }} --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }}
+          helm upgrade --debug --install --atomic --timeout 180s testkube ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-dashboard.image.tag=${{ github.event.client_payload.image_tag_dashboard }} --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
 
       - name: Deploy if Testkube Operator image is updated
         if: ${{ github.event.client_payload.image_tag_operator }}
         run: |
           helm dependency update ./charts/testkube
-          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ github.event.client_payload.image_tag_operator }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }}
+          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ github.event.client_payload.image_tag_operator }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
 
   notify_slack_if_deploy_stage_succeeds:
     runs-on: ubuntu-latest
     needs: release_charts_if_image_updated
     steps:
-      - name: Slack Notification if the helm release deployment to ${{ env.ENV }} GKS succeeded.
+      - name: Slack Notification if the helm release deployment to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace succeeded.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.release_charts_if_image_updated.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Helm chart release successfully deployed into ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE :party_blob:!
+          SLACK_TITLE: Helm chart release successfully deployed to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace :party_blob:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -129,13 +129,13 @@ jobs:
     needs: release_charts_if_image_updated
     if: always() && (needs.release_charts_if_image_updated.result == 'failure')
     steps:
-      - name: Slack Notification if the helm release deployment to ${{ env.ENV }} GKS failed.
+      - name: Slack Notification if the helm release deployment to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace failed.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.release_charts_if_image_updated.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Helm chart release failed to deploy into ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE! :boom:!
+          SLACK_TITLE: Helm chart release failed to deploy to ${{ env.GKE_CLUSTER_NAME }} GKE into ${{ env.DEPLOYMENT_NAME }} namespace :boom:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -160,12 +160,12 @@ jobs:
       # Get the GKE credentials so we can deploy to the cluster
       - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
         with:
-          cluster_name: ${{ env.GKE_CLUSTER_NAME_STAGE }}
-          location: ${{ env.GKE_ZONE_STAGE }}
+          cluster_name: ${{ env.GKE_CLUSTER_NAME }}
+          location: ${{ env.GKE_ZONE }}
           credentials: ${{ secrets.GKE_SA_KEY }}
 
       - name: Install testkube kubectl plugin and disable telemetry
-        run: bash <(curl -sSLf https://get.testkube.io) beta && kubectl testkube disable telemetry
+        run: bash <(curl -sSLf https://get.testkube.io) beta && kubectl testkube disable telemetry --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: Checkout tests from main Testkube repo
         uses: actions/checkout@v3
@@ -175,50 +175,50 @@ jobs:
 
       - name: Executor tests - delete/create/schedule all executor tests
         working-directory: ./testkube-repo
-        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s # (delete, create, schedule) - don't execute
+        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s # (delete, create, schedule) - don't execute ## needs optional namespace
 
       - name: (Re)create Postman Sanity test (with CLI)
         working-directory: ./testkube-repo
         run: |-
           # enabling debug mode
           set -x
-          kubectl -n testkube delete test sanity --ignore-not-found=true
-          kubectl -n testkube delete secret sanity-secrets --ignore-not-found=true
-          kubectl testkube create test -f ./test/postman/TestKube-Sanity.postman_collection.json --name sanity --type postman/collection -v api_uri=http://testkube-api-server:8088 -v test_api_uri=http://testkube-api-server:8088 -v test_type=postman/collection -v test_name=fill-me -v execution_name=fill-me
+          kubectl delete test sanity --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl delete secret sanity-secrets --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl testkube create test -f ./test/postman/TestKube-Sanity.postman_collection.json --name sanity --type postman/collection -v api_uri=http://testkube-api-server:8088 -v test_api_uri=http://testkube-api-server:8088 -v test_type=postman/collection -v test_name=fill-me -v execution_name=fill-me --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: Run Postman sanity tests
-        run: kubectl testkube run test sanity -f --git-branch develop
+        run: kubectl testkube run test sanity -f --git-branch develop --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: (Re)create Dashboard E2E tests (from CRD)
         working-directory: ./testkube-repo
         run: |-
           # enabling debug mode
           set -x
-          kubectl -n testkube delete test dashboard-e2e-tests --ignore-not-found=true
-          kubectl apply -f ./test/dashboard-e2e/crd/crd.yaml
+          kubectl delete test dashboard-e2e-tests --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl apply -f ./test/dashboard-e2e/crd/crd.yaml --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: (Re)create staging testsuite
         working-directory: ./testkube-repo
         run: |-
           # enabling debug mode
           set -x
-          kubectl -n testkube delete testsuite staging-testsuite --ignore-not-found=true
-          kubectl testkube create testsuite -f ./test/suites/staging-testsuite.json --name staging-testsuite
+          kubectl delete testsuite staging-testsuite --ignore-not-found=true --namespace ${{ env.DEPLOYMENT_NAME }}
+          kubectl testkube create testsuite -f ./test/suites/staging-testsuite.json --name staging-testsuite --namespace ${{ env.DEPLOYMENT_NAME }}
 
       - name: Run staging testsuite
-        run: kubectl testkube run testsuite staging-testsuite -f --git-branch develop
+        run: kubectl testkube run testsuite staging-testsuite -f --git-branch develop --namespace ${{ env.DEPLOYMENT_NAME }}
 
   notify_slack_if_test_suite_stage_succeeds:
     runs-on: ubuntu-latest
     needs: test_suite_run_stage
     steps:
-      - name: Slack Notification if the test suite run on STAGE GKS succeeded.
+      - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace succeeded.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Test suite successfully run against ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE :party_blob:!
+          SLACK_TITLE: Test suite successfully run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace :party_blob:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
@@ -229,13 +229,13 @@ jobs:
     needs: test_suite_run_stage
     if: always() && (needs.test_suite_run_stage.result == 'failure')
     steps:
-      - name: Slack Notification if the test suite run on ${{ env.ENV }} GKS failed.
+      - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace failed.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
           SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
-          SLACK_TITLE: Test suite FAILED to run on ${{ env.GKE_CLUSTER_NAME_STAGE }} GKE! :boom:!
+          SLACK_TITLE: Test suite FAILED to run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace! :boom:!
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/charts/testkube/values-stage.yaml b/charts/testkube/values-stage.yaml
index 5390e22f0..a22b6fb54 100644
--- a/charts/testkube/values-stage.yaml
+++ b/charts/testkube/values-stage.yaml
@@ -138,7 +138,7 @@ testkube-api:
       nginx.ingress.kubernetes.io/cors-allow-methods: "GET"
       nginx.ingress.kubernetes.io/cors-allow-credentials: "false"
       # specify the name of the global IP address resource to be associated with the HTTP(S) Load Balancer.
-      kubernetes.io/ingress.global-static-ip-name: testkube-integration
+      kubernetes.io/ingress.global-static-ip-name: testkube-stage
       # add an annotation indicating the issuer to use.
       # cert-manager.io/cluster-issuer: letsencrypt-prod
       # controls whether the ingress is modified ‘in-place’,
@@ -155,11 +155,11 @@ testkube-api:
 
     path: /results/(v\d/.*)
     hosts:
-      - integration.testkube.io
+      - stage.testkube.io
     tlsenabled: "true"
     tls: # < placing a host in the TLS config will indicate a certificate should be created
       - hosts:
-          - integration.testkube.io
+          - stage.testkube.io
         secretName: testkube-demo-cert-secret
   cliIngress:
     enabled: false
@@ -288,7 +288,7 @@ testkube-dashboard:
       nginx.ingress.kubernetes.io/auth-secret: htpasswd
       nginx.ingress.kubernetes.io/auth-realm: "Enter your credentials"
       # specify the name of the global IP address resource to be associated with the HTTP(S) Load Balancer.
-      kubernetes.io/ingress.global-static-ip-name: testkube-integration
+      kubernetes.io/ingress.global-static-ip-name: testkube-stage
       # add an annotation indicating the issuer to use.
       cert-manager.io/cluster-issuer: letsencrypt-prod
       # controls whether the ingress is modified ‘in-place’,
@@ -296,13 +296,13 @@ testkube-dashboard:
       acme.cert-manager.io/http01-edit-in-place: "true"
     path: /
     hosts:
-      - integration.testkube.io
+      - stage.testkube.io
     tlsenabled: "true"
     tls: # < placing a host in the TLS config will indicate a certificate should be created
       - hosts:
-          - integration.testkube.io
+          - stage.testkube.io
         secretName: testkube-demo-cert-secret
-  apiServerEndpoint: "integration.testkube.io/results" #get the address of the endpoint or set it using helm
+  apiServerEndpoint: "stage.testkube.io/results" #get the address of the endpoint or set it using helm
   disableTelemetry: true
   oauth2:
     enabled: false
@@ -320,7 +320,7 @@ testkube-dashboard:
       githubOrg: ""
       cookieSecret: ""
       cookieSecure: "false"
-      redirectUrl: "http://integration.testkube.io/oauth2/callback"
+      redirectUrl: "http://stage.testkube.io/oauth2/callback"
 
   ##Test Connection pod
   testConnection:

From 21a44247bedf5c85cfc86179300ed336bb5dd3c3 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Wed, 12 Jul 2023 16:32:12 +0300
Subject: [PATCH 02/10] minor additions

---
 .../helm-deploy-testkube-charts-stage-commit.yaml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index 0dee44080..fee13bee4 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -98,7 +98,7 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_FOOTER: "Kubeshop --> TestKube"
 
-  test_suite_run_stage:
+  test_suite_run:
     name: test suite for GKE cluster
     runs-on: ubuntu-latest
     needs: release_charts_if_image_updated
@@ -167,13 +167,13 @@ jobs:
 
   notify_slack_if_test_suite_stage_succeeds:
     runs-on: ubuntu-latest
-    needs: test_suite_run_stage
+    needs: test_suite_run
     steps:
       - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace succeeded.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
-          SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
+          SLACK_COLOR: ${{ needs.test_suite_run.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
           SLACK_TITLE: Test suite successfully run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace :party_blob:!
           SLACK_USERNAME: GitHub
@@ -183,14 +183,14 @@ jobs:
 
   notify_slack_if_test_suite_failed:
     runs-on: ubuntu-latest
-    needs: test_suite_run_stage
-    if: always() && (needs.test_suite_run_stage.result == 'failure')
+    needs: test_suite_run
+    if: always() && (needs.test_suite_run.result == 'failure')
     steps:
       - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace failed.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
-          SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
+          SLACK_COLOR: ${{ needs.test_suite_run.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
           SLACK_TITLE: Test suite FAILED to run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace! :boom:!
           SLACK_USERNAME: GitHub

From 1abf06a426937133211e70b151e7ab05e38c8e03 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Wed, 12 Jul 2023 16:44:06 +0300
Subject: [PATCH 03/10] minor editions

---
 .../helm-deploy-testkube-charts-stage-commit.yaml    |  2 +-
 .../workflows/helm-deploy-testkube-charts-stage.yaml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index fee13bee4..61afc82ae 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -60,7 +60,7 @@ jobs:
           echo ::set-output name=operator_image_tag::$(kubectl get deployment testkube-operator-controller-manager -o=jsonpath='{$.spec.template.spec.containers[1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
           echo ::set-output name=dashboard_image_tag::$(kubectl get deployment testkube-dashboard -o=jsonpath='{$.spec.template.spec.containers[:1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
 
-      - name: Deploy helm chart to Integration Cluster
+      - name: Deploy helm chart to Develop Cluster
         run: |
           helm dependency update ./charts/testkube
           helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
diff --git a/.github/workflows/helm-deploy-testkube-charts-stage.yaml b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
index affa360e9..5463a3f22 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
@@ -141,7 +141,7 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_FOOTER: "Kubeshop --> TestKube"
 
-  test_suite_run_stage:
+  test_suite_run:
     name: test suite for GKE cluster
     runs-on: ubuntu-latest
     needs: release_charts_if_image_updated
@@ -210,13 +210,13 @@ jobs:
 
   notify_slack_if_test_suite_stage_succeeds:
     runs-on: ubuntu-latest
-    needs: test_suite_run_stage
+    needs: test_suite_run
     steps:
       - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace succeeded.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
-          SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
+          SLACK_COLOR: ${{ needs.test_suite_run.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
           SLACK_TITLE: Test suite successfully run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace :party_blob:!
           SLACK_USERNAME: GitHub
@@ -226,14 +226,14 @@ jobs:
 
   notify_slack_if_test_suite_failed:
     runs-on: ubuntu-latest
-    needs: test_suite_run_stage
-    if: always() && (needs.test_suite_run_stage.result == 'failure')
+    needs: test_suite_run
+    if: always() && (needs.test_suite_run.result == 'failure')
     steps:
       - name: Slack Notification if the test suite run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace failed.
         uses: rtCamp/action-slack-notify@v2
         env:
           SLACK_CHANNEL: testkube-logs
-          SLACK_COLOR: ${{ needs.test_suite_run_stage.result }} # or a specific color like 'good' or '#ff00ff'
+          SLACK_COLOR: ${{ needs.test_suite_run.result }} # or a specific color like 'good' or '#ff00ff'
           SLACK_ICON: https://github.com/rtCamp.png?size=48
           SLACK_TITLE: Test suite FAILED to run on ${{ env.GKE_CLUSTER_NAME }} GKE in ${{ env.DEPLOYMENT_NAME }} namespace! :boom:!
           SLACK_USERNAME: GitHub

From 673ff93df96b0d20b9c65c2f4445c9e6406734b8 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Thu, 13 Jul 2023 12:34:51 +0300
Subject: [PATCH 04/10] add namespace to the tests

---
 .github/workflows/helm-deploy-testkube-charts-stage-commit.yaml | 2 +-
 .github/workflows/helm-deploy-testkube-charts-stage.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index 61afc82ae..e60861742 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -132,7 +132,7 @@ jobs:
 
       - name: Executor tests - delete/create/schedule all executor tests
         working-directory: ./testkube-repo
-        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s # (delete, create, schedule) - don't execute ## needs optional namespace
+        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s --namespace ${{ env.DEPLOYMENT_NAME }} # (delete, create, schedule) - don't execute
 
       - name: (Re)create Postman Sanity test (with CLI)
         working-directory: ./testkube-repo
diff --git a/.github/workflows/helm-deploy-testkube-charts-stage.yaml b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
index 5463a3f22..26a978005 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
@@ -175,7 +175,7 @@ jobs:
 
       - name: Executor tests - delete/create/schedule all executor tests
         working-directory: ./testkube-repo
-        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s # (delete, create, schedule) - don't execute ## needs optional namespace
+        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s --namespace ${{ env.DEPLOYMENT_NAME }} # (delete, create, schedule) - don't execute
 
       - name: (Re)create Postman Sanity test (with CLI)
         working-directory: ./testkube-repo

From 61213d1c2080cc950064d134d8c3789d0acad078 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Thu, 13 Jul 2023 13:52:10 +0300
Subject: [PATCH 05/10] update values.yaml

---
 ...helm-deploy-testkube-charts-stage-commit.yaml |  1 +
 charts/testkube/values-stage.yaml                | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index e60861742..0a9b52bd4 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -8,6 +8,7 @@ on:
       - "charts/testkube/values-stage.yaml"
     branches:
       - develop
+      - deploy_stage-TK-to-dev-cluster
 
 env:
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
diff --git a/charts/testkube/values-stage.yaml b/charts/testkube/values-stage.yaml
index a22b6fb54..5390e22f0 100644
--- a/charts/testkube/values-stage.yaml
+++ b/charts/testkube/values-stage.yaml
@@ -138,7 +138,7 @@ testkube-api:
       nginx.ingress.kubernetes.io/cors-allow-methods: "GET"
       nginx.ingress.kubernetes.io/cors-allow-credentials: "false"
       # specify the name of the global IP address resource to be associated with the HTTP(S) Load Balancer.
-      kubernetes.io/ingress.global-static-ip-name: testkube-stage
+      kubernetes.io/ingress.global-static-ip-name: testkube-integration
       # add an annotation indicating the issuer to use.
       # cert-manager.io/cluster-issuer: letsencrypt-prod
       # controls whether the ingress is modified ‘in-place’,
@@ -155,11 +155,11 @@ testkube-api:
 
     path: /results/(v\d/.*)
     hosts:
-      - stage.testkube.io
+      - integration.testkube.io
     tlsenabled: "true"
     tls: # < placing a host in the TLS config will indicate a certificate should be created
       - hosts:
-          - stage.testkube.io
+          - integration.testkube.io
         secretName: testkube-demo-cert-secret
   cliIngress:
     enabled: false
@@ -288,7 +288,7 @@ testkube-dashboard:
       nginx.ingress.kubernetes.io/auth-secret: htpasswd
       nginx.ingress.kubernetes.io/auth-realm: "Enter your credentials"
       # specify the name of the global IP address resource to be associated with the HTTP(S) Load Balancer.
-      kubernetes.io/ingress.global-static-ip-name: testkube-stage
+      kubernetes.io/ingress.global-static-ip-name: testkube-integration
       # add an annotation indicating the issuer to use.
       cert-manager.io/cluster-issuer: letsencrypt-prod
       # controls whether the ingress is modified ‘in-place’,
@@ -296,13 +296,13 @@ testkube-dashboard:
       acme.cert-manager.io/http01-edit-in-place: "true"
     path: /
     hosts:
-      - stage.testkube.io
+      - integration.testkube.io
     tlsenabled: "true"
     tls: # < placing a host in the TLS config will indicate a certificate should be created
       - hosts:
-          - stage.testkube.io
+          - integration.testkube.io
         secretName: testkube-demo-cert-secret
-  apiServerEndpoint: "stage.testkube.io/results" #get the address of the endpoint or set it using helm
+  apiServerEndpoint: "integration.testkube.io/results" #get the address of the endpoint or set it using helm
   disableTelemetry: true
   oauth2:
     enabled: false
@@ -320,7 +320,7 @@ testkube-dashboard:
       githubOrg: ""
       cookieSecret: ""
       cookieSecure: "false"
-      redirectUrl: "http://stage.testkube.io/oauth2/callback"
+      redirectUrl: "http://integration.testkube.io/oauth2/callback"
 
   ##Test Connection pod
   testConnection:

From 7bfbb7ba5b037118748b700abe4f3948ea225e6f Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Thu, 13 Jul 2023 13:56:06 +0300
Subject: [PATCH 06/10] test flow

---
 .../workflows/helm-deploy-testkube-charts-stage-commit.yaml   | 4 ++--
 .github/workflows/helm-deploy-testkube-charts-stage.yaml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index 0a9b52bd4..16571d6f5 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -4,8 +4,8 @@ concurrency: develop_cluster
 
 on:
   push:
-    paths:
-      - "charts/testkube/values-stage.yaml"
+#    paths:
+#      - "charts/testkube/values-stage.yaml"
     branches:
       - develop
       - deploy_stage-TK-to-dev-cluster
diff --git a/.github/workflows/helm-deploy-testkube-charts-stage.yaml b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
index 26a978005..6392c9cc4 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
@@ -87,7 +87,7 @@ jobs:
         id: vars
         run: |
           echo ::set-output name=api_image_tag::$(kubectl get deployment testkube-api-server -o=jsonpath='{$.spec.template.spec.containers[:1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
-          echo ::set-output name=operator_image_tag::$(kubectl get deployment testkube-operator-controller-manager -o=jsonpath='{$.spec.template.spec.containers[1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
+          echo ::set-output name=operator_image_tag::$(kubectl get deployment testkube-operator-controller-manager -o=jsonpath='{$.spec.template.spec.containers[1].image}' -n testkube | awk -F':' '{print $2}') || exit 1
           echo ::set-output name=dashboard_image_tag::$(kubectl get deployment testkube-dashboard -o=jsonpath='{$.spec.template.spec.containers[:1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
 
       - name: Deploy if Testkube API image is updated

From 209905694101fb6a65f226534849bcb465e00b15 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Thu, 13 Jul 2023 13:58:06 +0300
Subject: [PATCH 07/10] update namespace for the operator

---
 .github/workflows/helm-deploy-testkube-charts-stage-commit.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index 16571d6f5..3e8d96c86 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -58,7 +58,7 @@ jobs:
         id: vars
         run: |
           echo ::set-output name=api_image_tag::$(kubectl get deployment testkube-api-server -o=jsonpath='{$.spec.template.spec.containers[:1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
-          echo ::set-output name=operator_image_tag::$(kubectl get deployment testkube-operator-controller-manager -o=jsonpath='{$.spec.template.spec.containers[1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
+          echo ::set-output name=operator_image_tag::$(kubectl get deployment testkube-operator-controller-manager -o=jsonpath='{$.spec.template.spec.containers[1].image}' -n testkube | awk -F':' '{print $2}') || exit 1
           echo ::set-output name=dashboard_image_tag::$(kubectl get deployment testkube-dashboard -o=jsonpath='{$.spec.template.spec.containers[:1].image}' -n ${{ env.DEPLOYMENT_NAME }} | awk -F':' '{print $2}') || exit 1
 
       - name: Deploy helm chart to Develop Cluster

From 3778b628247e9dd5d5b6b5348c74a04c99eb4f56 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Thu, 13 Jul 2023 14:02:36 +0300
Subject: [PATCH 08/10] fix release name

---
 .github/workflows/helm-deploy-testkube-charts-stage-commit.yaml | 2 +-
 .github/workflows/helm-deploy-testkube-charts-stage.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index 3e8d96c86..cecbd9c9e 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -64,7 +64,7 @@ jobs:
       - name: Deploy helm chart to Develop Cluster
         run: |
           helm dependency update ./charts/testkube
-          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
+          helm upgrade --debug --install --atomic --timeout 180s testkube ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ steps.vars.outputs.operator_image_tag }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
 
   notify_slack_if_deploy_stage_succeeds:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/helm-deploy-testkube-charts-stage.yaml b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
index 6392c9cc4..c6e2075d2 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
@@ -106,7 +106,7 @@ jobs:
         if: ${{ github.event.client_payload.image_tag_operator }}
         run: |
           helm dependency update ./charts/testkube
-          helm upgrade --debug --install --atomic --timeout 180s ${{ env.DEPLOYMENT_NAME }} ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ github.event.client_payload.image_tag_operator }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
+          helm upgrade --debug --install --atomic --timeout 180s testkube ./charts/testkube --namespace ${{ env.DEPLOYMENT_NAME }} --create-namespace  --values ./charts/testkube/values-${{ env.ENV }}.yaml --set testkube-operator.image.tag=${{ github.event.client_payload.image_tag_operator }} --set testkube-dashboard.image.tag=${{ steps.vars.outputs.dashboard_image_tag }} --set testkube-api.image.tag=${{ steps.vars.outputs.api_image_tag }} --set testkube-api.multinamespace.enabled=true --set testkube-operator.enabled=false
 
   notify_slack_if_deploy_stage_succeeds:
     runs-on: ubuntu-latest

From 458f3e966e98367910ce2af856688605ef3a3ee5 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Thu, 13 Jul 2023 14:11:46 +0300
Subject: [PATCH 09/10] update namespace

---
 .github/workflows/helm-deploy-testkube-charts-stage-commit.yaml | 2 +-
 .github/workflows/helm-deploy-testkube-charts-stage.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index cecbd9c9e..473cb6958 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -133,7 +133,7 @@ jobs:
 
       - name: Executor tests - delete/create/schedule all executor tests
         working-directory: ./testkube-repo
-        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s --namespace ${{ env.DEPLOYMENT_NAME }} # (delete, create, schedule) - don't execute
+        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s -n ${{ env.DEPLOYMENT_NAME }} # (delete, create, schedule) - don't execute
 
       - name: (Re)create Postman Sanity test (with CLI)
         working-directory: ./testkube-repo
diff --git a/.github/workflows/helm-deploy-testkube-charts-stage.yaml b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
index c6e2075d2..09b293b4b 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
@@ -175,7 +175,7 @@ jobs:
 
       - name: Executor tests - delete/create/schedule all executor tests
         working-directory: ./testkube-repo
-        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s --namespace ${{ env.DEPLOYMENT_NAME }} # (delete, create, schedule) - don't execute
+        run: chmod +x ./test/scripts/executor-tests/run.sh && ./test/scripts/executor-tests/run.sh -d -c -s -n ${{ env.DEPLOYMENT_NAME }} # (delete, create, schedule) - don't execute
 
       - name: (Re)create Postman Sanity test (with CLI)
         working-directory: ./testkube-repo

From 1776574808b6b2174f019a6b6c47d53b8e414334 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Thu, 13 Jul 2023 14:22:00 +0300
Subject: [PATCH 10/10] remove testing branch

---
 .../workflows/helm-deploy-testkube-charts-stage-commit.yaml  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
index 473cb6958..70f3a1ce0 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage-commit.yaml
@@ -4,11 +4,10 @@ concurrency: develop_cluster
 
 on:
   push:
-#    paths:
-#      - "charts/testkube/values-stage.yaml"
+    paths:
+      - "charts/testkube/values-stage.yaml"
     branches:
       - develop
-      - deploy_stage-TK-to-dev-cluster
 
 env:
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}