Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#OB-553 fix: Analytics service issue fixes for OCI #3961

Merged
merged 2 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
sowmya-dixit marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions kubernetes/helm_charts/core/analytics/templates/deployment.yaml
sowmya-dixit marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/helm_charts/core/analytics/values.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down