Refine Helm Client Charts

Issue-ID: AAF-802
Change-Id: Ie00cd2919eeecef00aac1dae139c7ef80092589a
Signed-off-by: Instrumental <jonathan.gathman@att.com>

9 files changed, 43 insertions, 40 deletions

diff --git a/auth/helm/aaf-hello/templates/aaf-hello.yaml b/auth/helm/aaf-hello/templates/aaf-hello.yaml
index c114e5eb..787f32d5 100644
--- 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.cadi.port}}
+      nodePort: {{ .Values.cadi.public_port}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -52,37 +52,49 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: hello-config-vol
+      - name: aaf-hello-vol
         emptyDir: {}
       initContainers:
-        - name: hello-config-container
+        - name: aaf-hello-config
           image: {{ .Values.image.repository }}onap/aaf/aaf_agent:{{ .Values.image.version }}
           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"]
+              name: aaf-hello-vol
+          command: ["bash","-c","cd /opt/app/osaaf/local && /opt/app/aaf_config/bin/agent.sh place aaf@aaf.osaaf.org aaf-hello "]
           env:
             - name: "AAF_ENV"
-              value: "DEV"
+              value: "{{ .Values.cadi.aaf_env }}"
             - name: "AAF_FQDN"
-              value: "aaf-locate.onap"
+              value: "aaf-locate.{{ .Release.Namespace }}"
             - name: "APP_FQDN"
-              value: "aaf"
+              value: "{{ .Values.cadi.fqdn }}"
             - name: "APP_FQI"
-              value: "aaf@aaf.osaaf.org"
-            - name: LATITUDE
+              value: "{{ .Values.cadi.fqi }}"
+            - name: "LATITUDE"
               value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: LONGITUDE
+            - name: "LONGITUDE"
               value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: "CONTAINER_NS"
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
             - name: "DEPLOY_FQI"
               value: "deployer@people.osaaf.org"
             - name: "DEPLOY_PASSWORD"
               value: "demo123456!"
+            - name: "aaf_locator_container"
+              value: "helm"
+            - name: "aaf_locator_port"
+              value: "{{ .Values.cadi.port }}"
+            - name: "aaf_locator_fqdn.helm"
+              value: "{{ .Values.cadi.fqdn }}.{{.Release.Namespace}}"
+            - name: "aaf_locator_public_hostname"
+              value: "{{ .Values.cadi.public_fqdn }}"
+            - name: "aaf_locator_public_port"
+              value: "{{ .Values.cadi.public_port }}"
+            - name: "aaf_locator_container_ns"
+              value: "{{ .Release.Namespace }}"
+            - name: "aaf_locator_name"
+              value: "{{.Values.cadi.app_ns}}.hello"
+            - name: "aaf_locator_name.helm"
+              value: "{{ .Release.Namespace}}.{{.Values.cadi.app_ns}}.hello"
 
 ###
 ### AAF-HELLO
@@ -94,9 +106,8 @@ spec:
         command: ["/bin/bash","-c","cd /opt/app/aaf && exec bin/hello"]
         volumeMounts:
         -  mountPath: "/opt/app/osaaf/local"
-           name: hello-config-vol
+           name: aaf-hello-vol
         ports:
         - name: aaf-hello
           protocol: TCP
           containerPort: 8130
-
diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml
index d5fa7476..a4fd23c4 100644
--- a/auth/helm/aaf-hello/values.yaml
+++ b/auth/helm/aaf-hello/values.yaml
@@ -23,32 +23,24 @@
 # Declare variables to be passed into your templates.
 
 global:
-  persistence:
-    enabled: true
   common:
     namespace: "onap"
 
 replicas:
   hello: 1
 
-ingress:
-  enabled: false
-
 cadi:
-  hostname: "aaf.onap"
+  fqdn: "aaf-hello"
+  port: 8130
+  public_fqdn: "aaf.osaaf.org"
+  public_port: 30086
+  fqi: "aaf@aaf.osaaf.org"
+  app_ns: "org.osaaf.aaf"
   cadi_latitude: "38.0"  
   cadi_longitude: "-72.0"  
   aaf_env: "DEV"
 
-persistence:
-  # Note: Minikube will persist to /data on your host machine
-  mountPath: "/data/aaf"
-  hello:
-    volumeReclaimPolicy: Retain
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    mountSubPath: "config"
-    storageClass: "manual"
+persistence: {}
 
 image:
   # When using locally built Docker Container, set Repository to ""
diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml
index f8bca522..cd43f7ae 100644
--- a/auth/helm/aaf/templates/aaf-cm.yaml
+++ b/auth/helm/aaf/templates/aaf-cm.yaml
@@ -81,7 +81,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
+            - name: aaf_locator_public_fqdn
               value: "aaf.osaaf.org"
             - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index d53e9201..5d75bb98 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -115,6 +115,6 @@ spec:
                   fieldPath: metadata.namespace
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
+            - name: aaf_locator_public_fqdn
               value: "aaf.osaaf.org"
 
diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml
index dcff5e7b..dcc1f7f0 100644
--- a/auth/helm/aaf/templates/aaf-gui.yaml
+++ b/auth/helm/aaf/templates/aaf-gui.yaml
@@ -82,7 +82,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
+            - name: aaf_locator_public_fqdn
               value: "aaf.osaaf.org"
             - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml
index b09c80b8..8506d329 100644
--- a/auth/helm/aaf/templates/aaf-locate.yaml
+++ b/auth/helm/aaf/templates/aaf-locate.yaml
@@ -81,7 +81,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
+            - name: aaf_locator_public_fqdn
               value: "aaf.osaaf.org"
             - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index 1a382c06..722cc633 100644
--- a/auth/helm/aaf/templates/aaf-oauth.yaml
+++ b/auth/helm/aaf/templates/aaf-oauth.yaml
@@ -81,7 +81,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
+            - name: aaf_locator_public_fqdn
               value: "aaf.osaaf.org"
             - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index e6d6d09b..4a8f0b31 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -81,7 +81,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: aaf_locate_url
               value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
+            - name: aaf_locator_public_fqdn
               value: "aaf.osaaf.org"
             - name: CASSANDRA_CLUSTER
               value: "aaf-cass"
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index abea8902..e1fce7fe 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -40,7 +40,7 @@ ingress:
   enabled: false
 
 cadi:
-  hostname: "aaf.onap"
+  public_fqdn: "aaf.osaaf.org"
   cadi_latitude: "38.0"  
   cadi_longitude: "-72.0"  
   aaf_env: "DEV"