Reference the global bucket variable in the Helm chart

helmcharts/knowledgebb/charts/flink/values.yaml

@@ -170,7 +170,7 @@ base_config: |
       blob {
         storage {
           account = "{{ .Values.global.azure_storage_account_name }}.blob.core.windows.net"
-          container = "flink-check-points-store"
+          container = "{{ .Values.global.azure_public_container_name }}"
           checkpointing.dir = "checkpoint"
         }
       }

helmcharts/learnbb/charts/flink/values.yaml

@@ -111,7 +111,7 @@ taskmanager:
 
 # Azure Container Details
 checkpoint_store_type: "azure"
-cloud_storage_flink_bucketname: {{ .Values.global.azure_flink_state_container_name }}
+cloud_storage_flink_bucketname: "{{ .Values.global.azure_flink_state_container_name }}"
 
 # AWS S3 Details
 s3_access_key: ""
@@ -365,7 +365,7 @@ base_config: |
              {{- else if eq .Values.checkpoint_store_type "s3" -}}
               "{{- .Values.flink_dp_storage_container }}"
              {{- end }}
-            container = "{{ .Values.cloud_storage_flink_bucketname }}"
+            container = "{{ .Values.global.azure_flink_state_container_name }}"
             checkpointing.dir = "checkpoint"
           }
         }

helmcharts/obsrvbb/charts/etl-jobs/values.yaml

@@ -89,5 +89,5 @@ cassandra:
     old_table: "device_profile"
     new_table: "device_profile_temp"
 
-container_name: {{ .Values.global.azure_telemetry_container_name }}
+container_name: "{{ .Values.global.azure_telemetry_container_name }}"
 object_key: "druid-content-snapshot/snapshot.txt"

helmcharts/obsrvbb/charts/flink/values.yaml

@@ -134,7 +134,7 @@ azure_secret: "azure-secret"
 
 # Azure Container Details
 checkpoint_store_type: "azure"
-cloud_storage_flink_bucketname: {{ .Values.global.azure_flink_state_container_name }}
+cloud_storage_flink_bucketname: "{{ .Values.global.azure_flink_state_container_name }}"
 cloud_storage_content_bucketname: sunbird-content-dev
 cert_container_name: dev-e-credentials
 cloud_storage_endpoint: https://{{ .Values.global.azure_storage_account_name }}.blob.core.windows.net
@@ -287,7 +287,7 @@ base_config: |
           blob {
             storage {
               account = "{{ .Values.global.azure_storage_account_name }}.blob.core.windows.net"
-              container = "{{ .Values.container }}"
+              container = "{{ .Values.global.azure_flink_state_container_name }}"
               checkpointing.dir = "checkpoint"
             }
           }

terraform/azure/modules/keys/variables.tf

@@ -39,11 +39,4 @@ variable "rsa_keys_count" {
     default     = 2
 }
 
- variable "random_string" {
-    type        = string
-    description = "This string will be used to encrypt / mask various values. Use a strong random string in order to secure the applications. The string should be between 12 and 24 characters in length. If you forget the string, the application will stop working and the string cannot be retrieved."
-    validation {
-      condition     = length(var.random_string) >= 12 || length(var.random_string) <= 24
-      error_message = "The string must have a length ranging from 12 to 24 characters."
-  }
-}
+

terraform/azure/modules/output-file/main.tf

@@ -17,7 +17,7 @@ content  = templatefile("${path.module}/global-cloud-values.yaml.tfpl", {
     azure_dial_state_container_name = var.dial_state_container_public,
     azure_telemetry_container_name = var.telemetry_container_private,
     private_ingressgateway_ip = var.private_ingressgateway_ip,
-    encrypted_string = var.encryption_string,
+    encryption_string = var.encryption_string,
     random_string = var.random_string
   })
   filename = local.global_values_cloud_file

terraform/azure/template/install.sh

@@ -103,7 +103,7 @@ function install_helm_components() {
 }
 
 function dns_mapping() {
-    domain_name=$(kubectl get cm -n sunbird report-env -ojsonpath='{.data.SUNBIRD_ENV}')
+    domain_name=$(kubectl get cm -n sunbird lms-env -ojsonpath='{.data.sunbird_web_url}')
     PUBLIC_IP=$(kubectl get svc -n sunbird nginx-public-ingress -ojsonpath='{.status.loadBalancer.ingress[0].ip}')
 
     local timeout=$((SECONDS + 1200))
@@ -133,7 +133,7 @@ function generate_postman_env() {
     if [ "$(basename $current_directory)" != "$environment" ]; then
         cd ../terraform/azure/$environment 2>/dev/null || true
     fi
-    domain_name=$(kubectl get cm -n sunbird report-env -ojsonpath='{.data.SUNBIRD_ENV}')
+    domain_name=$(kubectl get cm -n sunbird lms-env -ojsonpath='{.data.sunbird_web_url}')
     api_key=$(kubectl get cm -n sunbird player-env -ojsonpath='{.data.sunbird_api_auth_token}')
     keycloak_secret=$(kubectl get cm -n sunbird player-env -ojsonpath='{.data.sunbird_portal_session_secret}')
     keycloak_admin=$(kubectl get cm -n sunbird userorg-env -ojsonpath='{.data.sunbird_sso_username}')