Rename new idfdev cluster

Author: fajpunk

.github/workflows/rsp-dev2-gke-tf.yaml .github/workflows/rsp-dev-new-gke-tf.yaml.github/workflows/rsp-dev2-gke-tf.yaml renamed to .github/workflows/rsp-dev-new-gke-tf.yaml

@@ -1,15 +1,15 @@
 # Deploys Science Platform Dev GCP Project with Terraform
-name: 'RSP DEV2 GKE'
+name: 'RSP DEV NEW GKE'
 
 on:
   pull_request:
     paths:
-      - 'environment/deployments/science-platform/env/dev2-gke.tfvars'
+      - 'environment/deployments/science-platform/env/dev-new-gke.tfvars'
   push:
     branches:
       - main
     paths:
-      - 'environment/deployments/science-platform/env/dev2-gke.tfvars'
+      - 'environment/deployments/science-platform/env/dev-new-gke.tfvars'
   schedule:
   - cron: 25 2 * * *
   workflow_dispatch:
@@ -55,7 +55,7 @@ jobs:
 
      # Initialize a new or existing terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
     - name: Terraform Init
-      run: terraform init -backend-config=bucket=${{ secrets.TERRAFORM_STATE_BUCKET }} -backend-config=prefix=science-platform/dev2/gke
+      run: terraform init -backend-config=bucket=${{ secrets.TERRAFORM_STATE_BUCKET }} -backend-config=prefix=science-platform/dev-new/gke
 
     # Checks that all terraform configuration files adhere to a canonical format
     - name: Terraform Validate
@@ -64,12 +64,12 @@ jobs:
     # Generates an execution plan for terraform
     - name: Terraform Plan
       id: plan
-      run: terraform plan -var-file=../env/dev2-gke.tfvars -no-color
+      run: terraform plan -var-file=../env/dev-new-gke.tfvars -no-color
 
     # On push to main, build or change infrastructure according to Terraform configuration files
     - name: Terraform Apply
       if: github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
-      run: terraform apply -var-file=../env/dev2-gke.tfvars -auto-approve
+      run: terraform apply -var-file=../env/dev-new-gke.tfvars -auto-approve
 
     - name: Report status
       if: failure() && github.ref == 'refs/heads/main'

environment/deployments/roundtable/gke/main.tf

@@ -33,7 +33,7 @@ module "gke" {
   source = "../../../../modules/gke"
 
   # Cluster
-  name                   = "${var.application_name}-${var.environment}"
+  name                   = var.cluster_name ? var.cluster_name : "${var.application_name}-${var.environment}"
   project_id             = local.project_id
   network                = var.network_name
   subnetwork             = local.subnetwork

environment/deployments/roundtable/gke/variables.tf

@@ -10,6 +10,12 @@ variable "environment" {
   type        = string
 }
 
+variable "cluster_name" {
+  description = "The name of the GKE cluster, if you want it to be different than application_name"
+  type = string
+  default = null
+}
+
 # VPC
 
 variable "network_name" {

…nts/science-platform/env/dev2-gke.tfvars …/science-platform/env/dev-new-gke.tfvarsenvironment/deployments/science-platform/env/dev2-gke.tfvars renamed to environment/deployments/science-platform/env/dev-new-gke.tfvars environment/deployments/science-platform/env/dev2-gke.tfvars renamed to environment/deployments/science-platform/env/dev-new-gke.tfvars

@@ -1,6 +1,7 @@
 # Project
 environment      = "dev"
 application_name = "science-platform"
+cluster_name = "rsp-dev"
 
 # This refers to the pre-DataplaneV2 Calico network policies. These are not
 # compatible with DataplaneV2, so they must not be enabled in clusters with

environment/deployments/science-platform/gke/.terraform.lock.hcl

@@ -33,7 +33,7 @@ module "gke" {
   source = "../../../../modules/gke"
 
   # Cluster
-  name                                 = "${var.application_name}-${var.environment}2"
+  name                                 = "${var.application_name}-${var.environment}"
   project_id                           = local.project_id
   network                              = var.network_name
   subnetwork                           = local.subnetwork