Merge pull request #3961 from sowmya-dixit/release-6.0.0

#OB-553 fix: Analytics service issue fixes for OCI
project-sunbird · Mar 28, 2024 · e647be6 · e647be6
2 parents 6c55e1a + 5af4495
commit e647be6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/ansible/roles/stack-sunbird/templates/analytics_api_service.conf b/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
@@ -201,10 +201,10 @@ public {
   }
 }
 cloud_storage_type="{{cloud_service_provider}}"
-storage.key.config="{{cloud_public_storage_accountname}}"
-storage.secret.config="{{cloud_public_storage_secret}}"
-public.storage.key.config="{{cloud_public_storage_accountname}}"
-public.storage.secret.config="{{cloud_public_storage_secret}}"
+storage.key.config="cloud_storage_key"
+storage.secret.config="cloud_storage_secret"
+public.storage.key.config="public_cloud_storage_key"
+public.storage.secret.config="public_cloud_storage_secret"
 cloud_storage_endpoint_with_protocol="{{cloud_storage_url}}"
 metrics.time.interval.min=30
 cache.refresh.time.interval.min=1440

diff --git a/kubernetes/helm_charts/core/analytics/templates/deployment.yaml b/kubernetes/helm_charts/core/analytics/templates/deployment.yaml
@@ -35,14 +35,14 @@ spec:
           value: {{ .Values.env.min_heap | quote }}
         - name: MAX_HEAP
           value: {{ .Values.env.max_heap | quote }}
-        - name: azure_storage_secret
-          value: {{ .Values.env.azure_private_account_secret | quote }}
-        - name: azure_storage_key
-          value: {{ .Values.env.azure_private_account_name | quote }}
-        - name: public_azure_storage_secret
-          value: {{ .Values.env.azure_public_account_secret | quote }}
-        - name: public_azure_storage_key
-          value: {{ .Values.env.azure_public_account_name | quote }}
+        - name: cloud_storage_secret
+          value: {{ .Values.env.cloud_private_account_secret | quote }}
+        - name: cloud_storage_key
+          value: {{ .Values.env.cloud_private_account_name | quote }}
+        - name: public_cloud_storage_secret
+          value: {{ .Values.env.cloud_public_account_secret | quote }}
+        - name: public_cloud_storage_key
+          value: {{ .Values.env.cloud_public_account_name | quote }}
         - name: _JAVA_OPTIONS
           value: -Dlog4j2.formatMsgNoLookups=true
         envFrom:

diff --git a/kubernetes/helm_charts/core/analytics/values.j2 b/kubernetes/helm_charts/core/analytics/values.j2
@@ -8,10 +8,10 @@ env:
   javaoptions: {{analytics_java_mem_limit|default('-Xmx600m')}}
   min_heap: {{analytics_min_heap_limit|default('-Xms1g')}}
   max_heap: {{analytics_max_heap_limit|default('-Xmx2g')}}
-  azure_private_account_secret: {{ cloud_private_storage_secret }}
-  azure_private_account_name: {{ cloud_private_storage_accountname }}
-  azure_public_account_secret: {{ cloud_public_storage_secret }}
-  azure_public_account_name: {{ cloud_public_storage_accountname }}
+  cloud_private_account_secret: {{ cloud_private_storage_secret }}
+  cloud_private_account_name: {{ cloud_private_storage_accountname }}
+  cloud_public_account_secret: {{ cloud_public_storage_secret }}
+  cloud_public_account_name: {{ cloud_public_storage_accountname }}
 replicaCount: {{analytics_replicacount|default(1)}}
 repository: {{analytics_repository|default('sunbird-analytics-service')}}
 image_tag: {{ image_tag }}