From cf55ade15db4801dd62da704a88839cfb080f4c1 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Thu, 31 Aug 2023 12:39:23 +0200 Subject: [PATCH] ci/cd - various fixes for k8s tests --- .github/workflows/staging-delete-infra.yml | 7 ------- .github/workflows/staging-tests.yml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/staging-delete-infra.yml b/.github/workflows/staging-delete-infra.yml index badcac29..9bb6b521 100644 --- a/.github/workflows/staging-delete-infra.yml +++ b/.github/workflows/staging-delete-infra.yml @@ -34,13 +34,6 @@ jobs: tar xf /tmp/terraform.tar -C / && mkdir ~/.ssh && touch ~/.ssh/id_rsa.pub env: SECRET_KEY: ${{ secrets.SECRET_KEY }} - - if: inputs.TYPE == 'k8s' - run: | - cd /tmp/${{ inputs.TYPE }} - terraform state rm kubernetes_secret.reg - terraform state rm kubectl_manifest.lb - terraform state rm local_sensitive_file.lb_yml - terraform state rm local_sensitive_file.kubeconfig - uses: azure/setup-kubectl@v3 if: inputs.TYPE == 'k8s' # Remove infra diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml index 6fb85b89..8992e0b2 100644 --- a/.github/workflows/staging-tests.yml +++ b/.github/workflows/staging-tests.yml @@ -54,7 +54,7 @@ jobs: rm -f /tmp/.secret_key tar xf /tmp/terraform.tar -C / mkdir /tmp/reg - cp tests/terraform/k8s.tf /tmp/reg + cp tests/terraform/k8s-reg.tf /tmp/reg cp tests/terraform/providers.tf /tmp/reg cd /tmp/reg export TF_VAR_k8s_reg_user=${REG_USER}