Commit 91396d0f authored by Aman Verma's avatar Aman Verma Committed by Vivek Ojha
Browse files

Adding configmap and partition related entries in schema-load related helm charts

parent 253a0a9c
......@@ -8,6 +8,7 @@ _The following commands can help generate a pre-populated custom_values file._
UNIQUE="<your_osdu_unique>" # e.g. demo
OSDU_HOST="<your_osdu_fqdn>" # e.g. osdu-$UNIQUE.contoso.com
IMAGE_VERSION="<your-release-version>" # e.g. 0.12.0
PARTITIONS="<partition_names_as_comma_separated_values>" # ie: "opendes" OR "opendes,opendes1"
# This logs your local Azure CLI in using the configured service principal.
az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID
......@@ -21,6 +22,9 @@ cat > ./schema_data_init_custom_values.yaml << EOF
# Specify the azure environment specific values
#
azure:
resourcegroup: $GROUP
identity_id: $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/osdu-identity-id --query value -otsv)
enable_msi: $AZURE_ENABLE_MSI
tenant_id: $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/tenant-id --query value -otsv)
resource_id: $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/aad-client-id --query value -otsv)
client_id: $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/app-dev-sp-username --query value -otsv)
......@@ -28,6 +32,12 @@ azure:
ingress:
dns: $OSDU_HOST
storage:
partitions: $PARTITIONS
config:
configmapname:
image:
repository: $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/container-registry --query value -otsv).azurecr.io
......
......@@ -2,10 +2,10 @@
apiVersion: batch/v1
kind: Job
metadata:
name: "schema-data-initialization-job"
name: {{ .Release.Name | quote }}
namespace: {{ $namespace }}
labels:
app: "schema-data-initialization-job"
app: {{ .Release.Name | quote }}
spec:
completions: 1
parallelism: 1
......@@ -22,8 +22,14 @@ spec:
imagePullPolicy: Always
name: "schema-data-init"
env:
- name: OSDU_IDENTITY_ID
value: {{ .Values.azure.identity_id }}
- name: AZURE_DNS_NAME
value: {{ .Values.ingress.dns }}
- name: RESOURCE_GROUP_NAME
value: {{ .Values.azure.resourcegroup }}
- name: CONFIG_MAP_NAME
value: {{ .Values.config.configmapname }}
- name: AZURE_TENANT_ID
value: {{ .Values.azure.tenant_id }}
- name: AZURE_AD_APP_RESOURCE_ID
......@@ -31,4 +37,8 @@ spec:
- name: AZURE_CLIENT_ID
value: {{ .Values.azure.client_id }}
- name: AZURE_CLIENT_SECRET
value: {{ .Values.azure.client_secret }}
\ No newline at end of file
value: {{ .Values.azure.client_secret }}
- name: AZURE_ENABLE_MSI
value: {{ .Values.azure.enable_msi | quote }}
- name: PARTITIONS # comma separated list of partitions
value: {{ .Values.storage.partitions }}
......@@ -3,6 +3,9 @@
# Specify the azure environment specific values
#
azure:
resourcegroup: <azure_resourcegroup>
identity_id: <azure_identity_id>
enable_msi: <azure_enable_msi>
tenant_id: <azure_tenant_id>
resource_id: <azure_app_resource_id>
client_id: <azure_client_id>
......@@ -11,6 +14,12 @@ azure:
ingress:
dns: <ingress_dns>
storage:
partitions: <storage_partitions> #A comma separated(no space) list of partition names
config:
configmapname: ~~CONFIG_MAP_NAME~~
image:
repository: msosdu.azurecr.io
tag: <image_tag>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment