From 91bc5616e61309a60458779a0dd5634c1274b6bb Mon Sep 17 00:00:00 2001 From: Dan Fuchs Date: Mon, 5 Oct 2026 10:02:04 -0500 Subject: [PATCH] workflows: `-new-gke.tfvars` -> `-gke.tfvars` Now that all of the clusters have been rebuilt and the old clusters destroyed, the existing clusters are no longer "new" --- ...able-dev-new-gke-tf.yaml => roundtable-dev-gke-tf.yaml} | 6 +++--- ...le-prod-new-gke-tf.yaml => roundtable-prod-gke-tf.yaml} | 6 +++--- .../{rsp-dev-new-gke-tf.yaml => rsp-dev-gke-tf.yaml} | 6 +++--- .../{rsp-int-new-gke-tf.yaml => rsp-int-gke-tf.yaml} | 7 +++---- .../{rsp-stable-new-gke-tf.yaml => rsp-stable-gke-tf.yaml} | 6 +++--- .../roundtable/env/{dev-new-gke.tfvars => dev-gke.tfvars} | 0 .../{production-new-gke.tfvars => production-gke.tfvars} | 0 .../env/{dev-new-gke.tfvars => dev-gke.tfvars} | 0 .../{integration-new-gke.tfvars => integration-gke.tfvars} | 0 .../{production-new-gke.tfvars => production-gke.tfvars} | 0 10 files changed, 15 insertions(+), 16 deletions(-) rename .github/workflows/{roundtable-dev-new-gke-tf.yaml => roundtable-dev-gke-tf.yaml} (75%) rename .github/workflows/{roundtable-prod-new-gke-tf.yaml => roundtable-prod-gke-tf.yaml} (71%) rename .github/workflows/{rsp-dev-new-gke-tf.yaml => rsp-dev-gke-tf.yaml} (71%) rename .github/workflows/{rsp-int-new-gke-tf.yaml => rsp-int-gke-tf.yaml} (87%) rename .github/workflows/{rsp-stable-new-gke-tf.yaml => rsp-stable-gke-tf.yaml} (88%) rename environment/deployments/roundtable/env/{dev-new-gke.tfvars => dev-gke.tfvars} (100%) rename environment/deployments/roundtable/env/{production-new-gke.tfvars => production-gke.tfvars} (100%) rename environment/deployments/science-platform/env/{dev-new-gke.tfvars => dev-gke.tfvars} (100%) rename environment/deployments/science-platform/env/{integration-new-gke.tfvars => integration-gke.tfvars} (100%) rename environment/deployments/science-platform/env/{production-new-gke.tfvars => production-gke.tfvars} (100%) diff --git a/.github/workflows/roundtable-dev-new-gke-tf.yaml b/.github/workflows/roundtable-dev-gke-tf.yaml similarity index 75% rename from .github/workflows/roundtable-dev-new-gke-tf.yaml rename to .github/workflows/roundtable-dev-gke-tf.yaml index bd44b39e..df6a7837 100644 --- a/.github/workflows/roundtable-dev-new-gke-tf.yaml +++ b/.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 diff --git a/.github/workflows/roundtable-prod-new-gke-tf.yaml b/.github/workflows/roundtable-prod-gke-tf.yaml similarity index 71% rename from .github/workflows/roundtable-prod-new-gke-tf.yaml rename to .github/workflows/roundtable-prod-gke-tf.yaml index 7bff6e23..979c3c11 100644 --- a/.github/workflows/roundtable-prod-new-gke-tf.yaml +++ b/.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 diff --git a/.github/workflows/rsp-dev-new-gke-tf.yaml b/.github/workflows/rsp-dev-gke-tf.yaml similarity index 71% rename from .github/workflows/rsp-dev-new-gke-tf.yaml rename to .github/workflows/rsp-dev-gke-tf.yaml index c74f081c..b645e65b 100644 --- a/.github/workflows/rsp-dev-new-gke-tf.yaml +++ b/.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 diff --git a/.github/workflows/rsp-int-new-gke-tf.yaml b/.github/workflows/rsp-int-gke-tf.yaml similarity index 87% rename from .github/workflows/rsp-int-new-gke-tf.yaml rename to .github/workflows/rsp-int-gke-tf.yaml index f8535624..9a1496d4 100644 --- a/.github/workflows/rsp-int-new-gke-tf.yaml +++ b/.github/workflows/rsp-int-gke-tf.yaml @@ -4,17 +4,16 @@ 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 @@ -22,6 +21,6 @@ jobs: 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 diff --git a/.github/workflows/rsp-stable-new-gke-tf.yaml b/.github/workflows/rsp-stable-gke-tf.yaml similarity index 88% rename from .github/workflows/rsp-stable-new-gke-tf.yaml rename to .github/workflows/rsp-stable-gke-tf.yaml index b31ed208..871b7ad3 100644 --- a/.github/workflows/rsp-stable-new-gke-tf.yaml +++ b/.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 diff --git a/environment/deployments/roundtable/env/dev-new-gke.tfvars b/environment/deployments/roundtable/env/dev-gke.tfvars similarity index 100% rename from environment/deployments/roundtable/env/dev-new-gke.tfvars rename to environment/deployments/roundtable/env/dev-gke.tfvars diff --git a/environment/deployments/roundtable/env/production-new-gke.tfvars b/environment/deployments/roundtable/env/production-gke.tfvars similarity index 100% rename from environment/deployments/roundtable/env/production-new-gke.tfvars rename to environment/deployments/roundtable/env/production-gke.tfvars diff --git a/environment/deployments/science-platform/env/dev-new-gke.tfvars b/environment/deployments/science-platform/env/dev-gke.tfvars similarity index 100% rename from environment/deployments/science-platform/env/dev-new-gke.tfvars rename to environment/deployments/science-platform/env/dev-gke.tfvars diff --git a/environment/deployments/science-platform/env/integration-new-gke.tfvars b/environment/deployments/science-platform/env/integration-gke.tfvars similarity index 100% rename from environment/deployments/science-platform/env/integration-new-gke.tfvars rename to environment/deployments/science-platform/env/integration-gke.tfvars diff --git a/environment/deployments/science-platform/env/production-new-gke.tfvars b/environment/deployments/science-platform/env/production-gke.tfvars similarity index 100% rename from environment/deployments/science-platform/env/production-new-gke.tfvars rename to environment/deployments/science-platform/env/production-gke.tfvars