From 7c59bcea56e02d93e48f7cabd3f4adb76a87e9d5 Mon Sep 17 00:00:00 2001 From: sowmya-dixit Date: Wed, 14 Feb 2024 13:30:28 +0530 Subject: [PATCH 1/2] #OB-553 fix: Analytics service issue fixes for OCI --- .../stack-sunbird/templates/analytics_api_service.conf | 8 ++++---- .../helm_charts/core/analytics/templates/deployment.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/analytics_api_service.conf b/ansible/roles/stack-sunbird/templates/analytics_api_service.conf index 8bdcd63467..b9a8c838c8 100644 --- 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 index 0926360f76..4ab9a13223 100644 --- a/kubernetes/helm_charts/core/analytics/templates/deployment.yaml +++ b/kubernetes/helm_charts/core/analytics/templates/deployment.yaml @@ -35,13 +35,13 @@ spec: value: {{ .Values.env.min_heap | quote }} - name: MAX_HEAP value: {{ .Values.env.max_heap | quote }} - - name: azure_storage_secret + - name: cloud_storage_secret value: {{ .Values.env.azure_private_account_secret | quote }} - - name: azure_storage_key + - name: cloud_storage_key value: {{ .Values.env.azure_private_account_name | quote }} - - name: public_azure_storage_secret + - name: public_cloud_storage_secret value: {{ .Values.env.azure_public_account_secret | quote }} - - name: public_azure_storage_key + - name: public_cloud_storage_key value: {{ .Values.env.azure_public_account_name | quote }} - name: _JAVA_OPTIONS value: -Dlog4j2.formatMsgNoLookups=true From 5af44953ebc8ca0b5b5f54f030fe4b497e0d9997 Mon Sep 17 00:00:00 2001 From: sowmya-dixit Date: Thu, 15 Feb 2024 11:27:10 +0530 Subject: [PATCH 2/2] #OB-553 fix: Analytics service issue fixes for OCI --- .../helm_charts/core/analytics/templates/deployment.yaml | 8 ++++---- kubernetes/helm_charts/core/analytics/values.j2 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kubernetes/helm_charts/core/analytics/templates/deployment.yaml b/kubernetes/helm_charts/core/analytics/templates/deployment.yaml index 4ab9a13223..57198cb77b 100644 --- a/kubernetes/helm_charts/core/analytics/templates/deployment.yaml +++ b/kubernetes/helm_charts/core/analytics/templates/deployment.yaml @@ -36,13 +36,13 @@ spec: - name: MAX_HEAP value: {{ .Values.env.max_heap | quote }} - name: cloud_storage_secret - value: {{ .Values.env.azure_private_account_secret | quote }} + value: {{ .Values.env.cloud_private_account_secret | quote }} - name: cloud_storage_key - value: {{ .Values.env.azure_private_account_name | quote }} + value: {{ .Values.env.cloud_private_account_name | quote }} - name: public_cloud_storage_secret - value: {{ .Values.env.azure_public_account_secret | quote }} + value: {{ .Values.env.cloud_public_account_secret | quote }} - name: public_cloud_storage_key - value: {{ .Values.env.azure_public_account_name | quote }} + 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 index 277f840947..5aae4e1daa 100644 --- 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 }}