Included partition details for tenant validation

devops/ibm/ibm-schema-config/templates/configmap.yaml

@@ -36,11 +36,11 @@ data:
 
 #tenant-validation
   PARTITION_API: "http://{{ .Release.Name }}-ibm-partition-deploy:8080/api/partition/v1"
-  partition.keycloak.client_id: "{{ .Values.data.kcClientId }}"
-  partition.keycloak.client_secert: "{{ .Values.data.keycloakClientSecret }}"
+  partition.keycloak.client_id: "{{ .Values.data.pKCClientId }}"
+  partition.keycloak.client_secert: "{{ .Values.data.pKCClientSecret }}"
   partition.keycloak.grant_type: "{{ .Values.data.grantType }}"
-  partition.keycloak.password: "{{ .Values.data.kcPassword }}"
+  partition.keycloak.password: "{{ .Values.data.pKCPassword }}"
   partition.keycloak.realm: "{{ .Values.data.keycloakRealm }}"
-  partition.keycloak.url: "{{ .Values.data.keycloakEndPointHost }}"
-  partition.keycloak.user: "{{ .Values.data.kcUser }}"
+  partition.keycloak.url: "{{ .Values.data.pKCEndPointHost }}"
+  partition.keycloak.user: "{{ .Values.data.pKCUser }}"
   tenantCache.exp.time.in.second: "{{ .Values.data.tenantCacheExpiryInSec }}"

devops/ibm/ibm-schema-config/values.yaml

@@ -32,12 +32,12 @@ data:
   secretKey: tbd
 
 #tenant-validation
-  pKCEndPointHost: 169.48.137.139
+  pKCEndPointHost: referenv
   keycloakRealm: OSDU
   pKCClientId: partition-service
-  pKCClientSecret: tbd
+  pKCClientSecret: referenv
   grantType: password
-  pKCPassword: tbd
+  pKCPassword: chnageit
   pKCUser: partition-service-admin
   tenantCacheExpiryInSec: 10000
   #refer-cm-template

devops/ibm/ibm-schema-deploy/templates/deployment.yaml

@@ -28,6 +28,17 @@ spec:
       serviceAccountName: {{ include "ibm-schema-deploy.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: {{ .Values.initimage.name }}
+          image: {{ .Values.initimage.initrepository }}:{{ .Values.initimage.tag }}
+          imagePullPolicy: {{ .Values.initimage.pullPolicy }} 
+          command: ['sh', '-c', './health_probe.sh $(HEALTH_URI)/info && sleep 5'] 
+          env:
+            - name: HEALTH_URI
+              valueFrom:
+                configMapKeyRef:
+                  name: schema-config
+                  key: AUTHORIZE_API
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -50,6 +61,16 @@ spec:
                 secretKeyRef:
                   key: root-password
                   name: {{ .Release.Name }}-minio
+            - name: partition.keycloak.client_secert
+              valueFrom:
+                secretKeyRef:
+                  key: partition_service_secret_data
+                  name: props-secret-generated-password
+            - name: partition.keycloak.url
+              valueFrom:
+                configMapKeyRef:
+                  key: partition.keycloak.url
+                  name: partition-config
           envFrom:
           - configMapRef:
               name: "{{ .Values.conf.configmap }}"