workflows: -new-gke.tfvars -> -gke.tfvars

.github/workflows/roundtable-dev-new-gke-tf.yaml → .github/workflows/roundtable-dev-gke-tf.yaml

@@ -4,12 +4,12 @@ name: 'Roundtable Dev New GKE'
 on:
   pull_request:
     paths:
-      - 'environment/deployments/roundtable/env/dev-new-gke.tfvars'
+      - 'environment/deployments/roundtable/env/dev-gke.tfvars'
   push:
     branches:
       - main
     paths:
-      - 'environment/deployments/roundtable/env/dev-new-gke.tfvars'
+      - 'environment/deployments/roundtable/env/dev-gke.tfvars'
   # Re-enable this when/if we want to deal with drift
   schedule:
     - cron: 25 2 * * *
@@ -22,6 +22,6 @@ jobs:
     with:
       working_directory: ./environment/deployments/roundtable/gke
       state_prefix: roundtable/dev-new/gke
-      tfvars_file: ../env/dev-new-gke.tfvars
+      tfvars_file: ../env/dev-gke.tfvars
       apply_on_workflow_dispatch: true
     secrets: inherit

.github/workflows/roundtable-prod-new-gke-tf.yaml → .github/workflows/roundtable-prod-gke-tf.yaml

@@ -4,12 +4,12 @@ name: 'Roundtable Prod New GKE'
 on:
   pull_request:
     paths:
-      - 'environment/deployments/roundtable/env/production-new-gke.tfvars'
+      - 'environment/deployments/roundtable/env/production-gke.tfvars'
   push:
     branches:
       - main
     paths:
-      - 'environment/deployments/roundtable/env/production-new-gke.tfvars'
+      - 'environment/deployments/roundtable/env/production-gke.tfvars'
   schedule:
     - cron: 25 2 * * *
   workflow_dispatch:
@@ -21,6 +21,6 @@ jobs:
     with:
       working_directory: ./environment/deployments/roundtable/gke
       state_prefix: roundtable/prod/new-gke
-      tfvars_file: ../env/production-new-gke.tfvars
+      tfvars_file: ../env/production-gke.tfvars
       apply_on_workflow_dispatch: true
     secrets: inherit

.github/workflows/rsp-dev-new-gke-tf.yaml → .github/workflows/rsp-dev-gke-tf.yaml

@@ -4,12 +4,12 @@ name: 'RSP DEV NEW GKE'
 on:
   pull_request:
     paths:
-      - 'environment/deployments/science-platform/env/dev-new-gke.tfvars'
+      - 'environment/deployments/science-platform/env/dev-gke.tfvars'
   push:
     branches:
       - main
     paths:
-      - 'environment/deployments/science-platform/env/dev-new-gke.tfvars'
+      - 'environment/deployments/science-platform/env/dev-gke.tfvars'
   schedule:
     - cron: 25 2 * * *
 
@@ -20,6 +20,6 @@ jobs:
     with:
       working_directory: ./environment/deployments/science-platform/gke
       state_prefix: science-platform/dev-new/gke
-      tfvars_file: ../env/dev-new-gke.tfvars
+      tfvars_file: ../env/dev-gke.tfvars
       apply_on_workflow_dispatch: true
     secrets: inherit

.github/workflows/rsp-int-new-gke-tf.yaml → .github/workflows/rsp-int-gke-tf.yaml

@@ -4,24 +4,23 @@ name: 'RSP INT NEW GKE'
 on:
   pull_request:
     paths:
-      - 'environment/deployments/science-platform/env/integration-new-gke.tfvars'
+      - 'environment/deployments/science-platform/env/integration-gke.tfvars'
   push:
     branches:
       - main
     paths:
-      - 'environment/deployments/science-platform/env/integration-new-gke.tfvars'
+      - 'environment/deployments/science-platform/env/integration-gke.tfvars'
   schedule:
     - cron: 25 2 * * *
   workflow_dispatch:
 
-
 jobs:
   terraform:
     name: Terraform
     uses: ./.github/workflows/_reusable-terraform-plan-apply.yaml
     with:
       working_directory: ./environment/deployments/science-platform/gke
       state_prefix: science-platform/int/new-gke
-      tfvars_file: ../env/integration-new-gke.tfvars
+      tfvars_file: ../env/integration-gke.tfvars
       apply_on_workflow_dispatch: true
     secrets: inherit

.github/workflows/rsp-stable-new-gke-tf.yaml → .github/workflows/rsp-stable-gke-tf.yaml

@@ -4,12 +4,12 @@ name: 'RSP STABLE NEW GKE'
 on:
   pull_request:
     paths:
-      - 'environment/deployments/science-platform/env/production-new-gke.tfvars'
+      - 'environment/deployments/science-platform/env/production-gke.tfvars'
   push:
     branches:
       - main
     paths:
-      - 'environment/deployments/science-platform/env/production-new-gke.tfvars'
+      - 'environment/deployments/science-platform/env/production-gke.tfvars'
   schedule:
     - cron: 25 2 * * *
   workflow_dispatch:
@@ -21,6 +21,6 @@ jobs:
     with:
       working_directory: ./environment/deployments/science-platform/gke
       state_prefix: science-platform/stable/new-gke
-      tfvars_file: ../env/production-new-gke.tfvars
+      tfvars_file: ../env/production-gke.tfvars
       apply_on_workflow_dispatch: true
     secrets: inherit