Merge "Sonar fix: Perm.java"

[aaf/authz.git] / auth / helm / aaf-hello / templates / aaf-hello.yaml

diff --git a/auth/helm/aaf-hello/templates/aaf-hello.yaml b/auth/helm/aaf-hello/templates/aaf-hello.yaml
index c114e5e..3ff9a57 100644 (file)
--- a/auth/helm/aaf-hello/templates/aaf-hello.yaml
+++ b/auth/helm/aaf-hello/templates/aaf-hello.yaml
@@ -31,8 +31,8 @@ spec:
   ports:
     - name: aaf-hello
       protocol: TCP
-      port: 8130
-      nodePort: 30086
+      port: {{ .Values.service.port }}
+      nodePort: {{ .Values.service.public_port }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -52,33 +52,34 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: hello-config-vol
-        emptyDir: {}
+        - name: aaf-hello-vol
+          persistentVolumeClaim:
+            claimName: aaf-hello-pvc
       initContainers:
-        - name: hello-config-container
-          image: {{ .Values.image.repository }}onap/aaf/aaf_agent:{{ .Values.image.version }}
+        - name: aaf-hello-config
+          image: "{{ .Values.image.repository }}{{ .Values.service.agentImage }}"
           imagePullPolicy: IfNotPresent
           volumeMounts:
-            - mountPath: "/opt/app/osaaf/local"
-              name: hello-config-vol
-          command: ["bash","-c","cd /opt/app/osaaf/local && /opt/app/aaf_config/bin/agent.sh place aaf@aaf.osaaf.org aaf"]
+            - mountPath: "/opt/app/osaaf"
+              name: aaf-hello-vol
+          command: ["bash","-c","exec /opt/app/aaf_config/bin/agent.sh"]
           env:
-            - name: "AAF_ENV"
-              value: "DEV"
-            - name: "AAF_FQDN"
-              value: "aaf-locate.onap"
-            - name: "APP_FQDN"
-              value: "aaf"
-            - name: "APP_FQI"
-              value: "aaf@aaf.osaaf.org"
-            - name: LATITUDE
-              value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: "CONTAINER_NS"
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+            - name: APP_FQI
+              value: "{{ .Values.service.fqi }}"
+            - name: aaf_locate_url
+              value: "https://aaf-locate.{{.Release.Namespace }}:8095"
+            - name: aaf_locator_container
+              value: "helm"
+            - name: aaf_locator_container_ns
+              value: "{{ .Release.Namespace }}"
+            - name: aaf_locator_fqdn
+              value: "{{.Values.service.fqdn}}"
+            - name: aaf_locator_public_fqdn
+              value: "{{.Values.service.public_fqdn}}"
+            - name: cadi_latitude
+              value: "{{ .Values.service.cadi_latitude }}"
+            - name: cadi_longitude
+              value: "{{ .Values.service.cadi_longitude }}"
             - name: "DEPLOY_FQI"
               value: "deployer@people.osaaf.org"
             - name: "DEPLOY_PASSWORD"
@@ -89,14 +90,13 @@ spec:
 ###
       containers:
       - name: aaf-hello
-        image: {{ .Values.image.repository }}onap/aaf/aaf_hello:{{ .Values.image.version }}
+        image: {{ .Values.image.repository }}{{ .Values.service.image }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","-c","cd /opt/app/aaf && exec bin/hello"]
+        command: ["bash","-c","cd /opt/app/aaf && if [ ! -d /opt/app/osaaf/etc ]; then cp -Rf etc logs /opt/app/osaaf; fi && exec bin/hello"]
         volumeMounts:
-        -  mountPath: "/opt/app/osaaf/local"
-           name: hello-config-vol
+        -  mountPath: "/opt/app/osaaf"
+           name: aaf-hello-vol
         ports:
-        - name: aaf-hello
-          protocol: TCP
-          containerPort: 8130
-
+        -  name: aaf-hello
+           protocol: TCP
+           containerPort: {{ .Values.service.port }}