DCAE R6 updates

[oom.git] / kubernetes / dcaegen2 / components / dcae-bootstrap / templates / deployment.yaml

diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
index be5a769..a36164d 100644 (file)
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
@@ -24,7 +24,7 @@ metadata:
   labels:\r
     app: {{ include "common.name" . }}\r
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}\r
-    release: {{ .Release.Name }}\r
+    release: {{ include "common.release" . }}\r
     heritage: {{ .Release.Service }}\r
 spec:\r
   replicas: 1\r
@@ -32,7 +32,7 @@ spec:
     metadata:\r
       labels:\r
         app: {{ include "common.name" . }}\r
-        release: {{ .Release.Name }}\r
+        release: {{ include "common.release" . }}\r
     spec:\r
       initContainers:\r
       - name: {{ include "common.name" . }}-readiness\r
@@ -53,8 +53,11 @@ spec:
           - dcae-config-binding-service\r
           - --container-name\r
           - dcae-db\r
+          - --container-name\r
+          - dcae-inventory-api\r
           - "-t"\r
           - "15"\r
+\r
         env:\r
         - name: NAMESPACE\r
           valueFrom:\r
@@ -68,11 +71,13 @@ spec:
             fieldRef:\r
               apiVersion: v1\r
               fieldPath: status.podIP\r
+        - name: aaf_locator_fqdn\r
+          value: dcae\r
         image: {{ .Values.global.tlsRepository }}/{{ .Values.global.tlsImage }}\r
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}\r
         resources: {}\r
         volumeMounts:\r
-        - mountPath: /opt/tls/shared\r
+        - mountPath: /opt/app/osaaf\r
           name: tls-info\r
       containers:\r
         - name: {{ include "common.name" . }}\r