env variables (#1212)

Co-authored-by: Automatic Update <radix@statoilsrm.onmicrosoft.com>
equinor · Feb 22, 2024 · 3941a73 · 3941a73
1 parent 9ae8610
commit 3941a73
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/scripts/radix-zone/radix_zone_c2.env b/scripts/radix-zone/radix_zone_c2.env
@@ -14,6 +14,7 @@
 
 RADIX_PLATFORM_REPOSITORY_PATH=$(readlink -f $(dirname ${BASH_SOURCE[0]})/../../)
 RADIX_ZONE="c2"
+RADIX_ZONE_MIGRATE="c2"
 AZ_RADIX_ZONE_LOCATION="westeurope"
 RADIX_ENVIRONMENT="prod"
 CLUSTER_TYPE="production" # "production", "playground", "development"
@@ -161,9 +162,9 @@ DDOS_PROTECTION_STANDARD_RESOURCE_ID="/subscriptions/ded7ca41-37c8-4085-862f-b11
 ### Velero Enviroment
 ###
 
-AZ_VELERO_RESOURCE_GROUP="backups"
+AZ_VELERO_RESOURCE_GROUP="common-${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_SECRET_NAME="velero-credentials"
-AZ_VELERO_STORAGE_ACCOUNT_ID="${AZ_SUBSCRIPTION_NAME}radixvelero${RADIX_ZONE}"
+AZ_VELERO_STORAGE_ACCOUNT_ID="radixvelero${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_STORAGE_BLOB_CONTAINER="velero"                                   # Default value that should be updated by installation code. Must be unique per cluster or you run the risk of sharing the blob.
 VELERO_NAMESPACE="velero"
 AZ_VELERO_STORAGE_ACCOUNT_KIND="BlobStorage"
@@ -179,7 +180,8 @@ RADIX_API_REQUIRE_APP_AD_GROUPS=true
 ### Radix Vulnerability Scanner Environment
 ###
 
-AZ_RESOURCE_GROUP_VULNERABILITY_SCAN_SQL="vulnerability-scan-$RADIX_ZONE"
+
+AZ_RESOURCE_GROUP_VULNERABILITY_SCAN_SQL="vulnerability-scan-$RADIX_ZONE_MIGRATE"
 KV_SECRET_VULNERABILITY_SCAN_SQL_ADMIN="radix-vulnerability-scan-db-admin"
 KV_SECRET_VULNERABILITY_SCAN_DB_WRITER="radix-vulnerability-scan-db-writer"
 KV_SECRET_VULNERABILITY_SCAN_DB_API="radix-vulnerability-scan-db-api"

diff --git a/scripts/radix-zone/radix_zone_dev.env b/scripts/radix-zone/radix_zone_dev.env
@@ -15,6 +15,7 @@
 
 RADIX_PLATFORM_REPOSITORY_PATH=$(readlink -f $(dirname ${BASH_SOURCE[0]})/../../)
 RADIX_ZONE="dev"
+RADIX_ZONE_MIGRATE="dev"
 AZ_RADIX_ZONE_LOCATION="${AZ_LOCATION}"
 RADIX_ENVIRONMENT="dev"
 CLUSTER_TYPE="development" # "production", "playground", "development"
@@ -166,9 +167,9 @@ RADIX_PE_KV_SECRET_NAME="radix-private-endpoints-${RADIX_ZONE}"
 ### Velero Enviroment
 ###
 
-AZ_VELERO_RESOURCE_GROUP="backups"
+AZ_VELERO_RESOURCE_GROUP="common-${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_SECRET_NAME="velero-credentials"
-AZ_VELERO_STORAGE_ACCOUNT_ID="${AZ_SUBSCRIPTION_NAME}radixvelero${RADIX_ENVIRONMENT}"
+AZ_VELERO_STORAGE_ACCOUNT_ID="radixvelero${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_STORAGE_BLOB_CONTAINER="velero"                      # Default value that should be updated by installation code. Must be unique per cluster or you run the risk of sharing the blob.
 VELERO_NAMESPACE="velero"
 AZ_VELERO_STORAGE_ACCOUNT_KIND="BlobStorage"
@@ -184,6 +185,7 @@ RADIX_API_REQUIRE_APP_AD_GROUPS=true
 ### Radix Vulnerability Scanner Environment
 ###
 
+
 AZ_RESOURCE_GROUP_VULNERABILITY_SCAN_SQL="vulnerability-scan-$RADIX_ZONE"
 KV_SECRET_VULNERABILITY_SCAN_SQL_ADMIN=radix-vulnerability-scan-db-admin
 KV_SECRET_VULNERABILITY_SCAN_DB_WRITER="radix-vulnerability-scan-db-writer"
@@ -199,7 +201,7 @@ VULNERABILITY_SCAN_SQL_SCANNER_USER=radix-scanner-writer
 ### Radix Cost Allocation Environment
 ###
 
-AZ_RESOURCE_GROUP_COST_ALLOCATION_SQL=cost-allocation
+AZ_RESOURCE_GROUP_COST_ALLOCATION_SQL="cost-allocation-${RADIX_ZONE}"
 KV_SECRET_COST_ALLOCATION_SQL_ADMIN=radix-cost-allocation-db-admin
 KV_SECRET_COST_ALLOCATION_DB_WRITER="radix-cost-allocation-db-writer-$RADIX_ZONE"
 KV_SECRET_COST_ALLOCATION_DB_API="radix-cost-allocation-db-api-$RADIX_ZONE"

diff --git a/scripts/radix-zone/radix_zone_playground.env b/scripts/radix-zone/radix_zone_playground.env
@@ -14,6 +14,7 @@
 
 RADIX_PLATFORM_REPOSITORY_PATH=$(readlink -f $(dirname ${BASH_SOURCE[0]})/../../)
 RADIX_ZONE="playground"
+RADIX_ZONE_MIGRATE="playground"
 AZ_RADIX_ZONE_LOCATION="northeurope"
 RADIX_ENVIRONMENT="dev"
 CLUSTER_TYPE="playground" # "production", "playground", "development"
@@ -163,9 +164,9 @@ RADIX_PE_KV_SECRET_NAME="radix-private-endpoints-${RADIX_ZONE}"
 ### Velero Enviroment
 ###
 
-AZ_VELERO_RESOURCE_GROUP="backups"
+AZ_VELERO_RESOURCE_GROUP="common-${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_SECRET_NAME="velero-credentials"
-AZ_VELERO_STORAGE_ACCOUNT_ID="${AZ_SUBSCRIPTION_NAME}radixvelero${RADIX_ENVIRONMENT}"
+AZ_VELERO_STORAGE_ACCOUNT_ID="radixvelero${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_STORAGE_BLOB_CONTAINER="velero"                      # Default value that should be updated by installation code. Must be unique per cluster or you run the risk of sharing the blob.
 VELERO_NAMESPACE="velero"
 AZ_VELERO_STORAGE_ACCOUNT_KIND="BlobStorage"

diff --git a/scripts/radix-zone/radix_zone_prod.env b/scripts/radix-zone/radix_zone_prod.env
@@ -14,6 +14,7 @@
 
 RADIX_PLATFORM_REPOSITORY_PATH=$(readlink -f $(dirname ${BASH_SOURCE[0]})/../../)
 RADIX_ZONE="prod"
+RADIX_ZONE_MIGRATE="platform"
 AZ_RADIX_ZONE_LOCATION="northeurope"
 RADIX_ENVIRONMENT="prod"
 CLUSTER_TYPE="production" # "production", "playground", "development"
@@ -167,9 +168,9 @@ DDOS_PROTECTION_STANDARD_RESOURCE_ID="/subscriptions/ded7ca41-37c8-4085-862f-b11
 ### Velero Enviroment
 ###
 
-AZ_VELERO_RESOURCE_GROUP="backups"
+AZ_VELERO_RESOURCE_GROUP="common-${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_SECRET_NAME="velero-credentials"
-AZ_VELERO_STORAGE_ACCOUNT_ID="${AZ_SUBSCRIPTION_NAME}radixvelero${RADIX_ZONE}"
+AZ_VELERO_STORAGE_ACCOUNT_ID="radixvelero${RADIX_ZONE_MIGRATE}"
 AZ_VELERO_STORAGE_BLOB_CONTAINER="velero"                      # Default value that should be updated by installation code. Must be unique per cluster or you run the risk of sharing the blob.
 VELERO_NAMESPACE="velero"
 AZ_VELERO_STORAGE_ACCOUNT_KIND="BlobStorage"

diff --git a/scripts/velero/install_prerequisites_in_cluster.sh b/scripts/velero/install_prerequisites_in_cluster.sh
@@ -308,7 +308,7 @@ data:
         default: true
         bucket: "$CLUSTER_NAME"
         config:
-          resourceGroup: backups
+          resourceGroup: "common-${RADIX_ZONE_MIGRATE}"
           storageAccount: "$AZ_VELERO_STORAGE_ACCOUNT_ID"
       volumeSnapshotLocation:
         - name: azure