update Agent for Helm

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

5 files changed, 169 insertions, 99 deletions

diff --git a/auth/helm/aaf-hello/aaf.sh b/auth/helm/aaf-hello/aaf.sh
index b1c8e639..2a99d1bb 100644
--- a/auth/helm/aaf-hello/aaf.sh
+++ b/auth/helm/aaf-hello/aaf.sh
@@ -16,39 +16,36 @@ kubectl -n onap run -it --rm aaf-agent-$USER --image=$IMAGE --overrides='
                  ],
                 "env": [
                    {
+                     "name": "APP_FQI",
+                     "value": "aaf@aaf.osaaf.org"
+                   },{
+                     "name": "DEPLOY_FQI",
+                     "value": "deployer@people.osaaf.org"
+                   },{
+                     "name": "DEPLOY_PASSWORD",
+                     "value": "demo123456!"
+                   },{
+                     "name": "aaf_locate_url",
+                     "value": "https://aaf-locate.onap:8095"
+                   },{
                      "name": "aaf_locator_container",
                      "value": "helm"
-		   },{
+                   },{
+                     "name": "aaf_locator_container_ns",
+                     "value": "onap"
+                   },{
+                     "name": "aaf_locator_public_fqdn",
+                     "value": "aaf.osaaf.org"
+                   },{
                      "name": "aaf_locator_fqdn",
-                     "value": "'$HOSTNAME'"
-		   },{
-                     "name": "aaf_locator_url",
-                     "value": "https://aaf-locate:8095"
-		   },{
-                     "name": "aaf_locator_public_hostname",
-                     "value": "'$HOSTNAME'"
-		   },{
-                     "name": "AAF_ENV",
-                     "value": "'$AAF_ENV'"
-		   },{
-                     "name": "LATITUDE",
+                     "value": "aaf-hello"
+                   },{
+                     "name": "cadi_latitude",
                      "value": "'$LATITUDE'"
-		   },{
-                     "name": "LONGITUDE",
+                   },{
+                     "name": "cadi_longitude",
                      "value": "'$LONGITUDE'"
-		   },{
-                     "name": "CASSANDRA_CLUSTER",
-                     "value": "'$CASSANDRA_CLUSTER'"
-		   },{
-                     "name": "CASSANDRA_USER",
-                     "value": "'$CASSANDRA_USER'"
-		   },{
-                     "name": "CASSANDRA_PASSWORD",
-                     "value": "'$CASSANDRA_PASSWORD'"
-		   },{
-                     "name": "CASSANDRA_PORT",
-                     "value": "'$CASSANDRA_PORT'"
-		   }
+                   }
                 ],
                 "stdin": true,
                 "stdinOnce": true,
@@ -56,26 +53,16 @@ kubectl -n onap run -it --rm aaf-agent-$USER --image=$IMAGE --overrides='
                 "volumeMounts": [
                     {
                         "mountPath": "/opt/app/osaaf",
-                        "name": "aaf-config-vol"
-                    },
-                    {
-                        "mountPath": "/opt/app/aaf/status",
-                        "name": "aaf-status-vol"
+                        "name": "aaf-hello-vol"
                     }
                 ]
             }
         ],
       "volumes": [
             {
-                "name": "aaf-config-vol",
-                "persistentVolumeClaim": {
-                    "claimName": "aaf-config-pvc"
-                }
-            },
-            {
-                "name": "aaf-status-vol",
+                "name": "aaf-hello-vol",
                 "persistentVolumeClaim": {
-                    "claimName": "aaf-status-pvc"
+                    "claimName": "aaf-hello-pvc"
                 }
             }
         ]
diff --git a/auth/helm/aaf-hello/templates/aaf-hello-pv.yaml b/auth/helm/aaf-hello/templates/aaf-hello-pv.yaml
new file mode 100644
index 00000000..166d766a
--- /dev/null
+++ b/auth/helm/aaf-hello/templates/aaf-hello-pv.yaml
@@ -0,0 +1,44 @@
+{{- if and .Values.global.persistence.enabled (not .Values.persistence.existingClaim) -}}
+#########
+##  ============LICENSE_START====================================================
+##  org.onap.aaf
+##  ===========================================================================
+##  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+##  ===========================================================================
+##  Licensed under the Apache License, Version 2.0 (the "License");
+##  you may not use this file except in compliance with the License.
+##  You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##  ============LICENSE_END====================================================
+##
+
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+  name: {{ .Chart.Name  }}-pv
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Chart.Name  }}
+spec:
+  capacity:
+    storage: {{ .Values.persistence.size}}
+  accessModes:
+    - {{ .Values.persistence.accessMode }}
+  persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
+  hostPath:
+     path: {{ .Values.persistence.mountPath }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
diff --git a/auth/helm/aaf-hello/templates/aaf-hello-pvc.yaml b/auth/helm/aaf-hello/templates/aaf-hello-pvc.yaml
new file mode 100644
index 00000000..fce3aa84
--- /dev/null
+++ b/auth/helm/aaf-hello/templates/aaf-hello-pvc.yaml
@@ -0,0 +1,49 @@
+{{- if and .Values.global.persistence.enabled (not .Values.persistence.existingClaim) -}}
+#########
+##  ============LICENSE_START====================================================
+##  org.onap.aaf
+##  ===========================================================================
+##  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+##  ===========================================================================
+##  Licensed under the Apache License, Version 2.0 (the "License");
+##  you may not use this file except in compliance with the License.
+##  You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##  ============LICENSE_END====================================================
+##
+
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ .Chart.Name }}-pvc
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Chart.Name }}
+{{- if .Values.persistence.annotations }}
+  annotations:
+{{ toYaml .Values.persistence.annotations | indent 4 }}
+{{- end }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Chart.Name }}
+  accessModes:
+    - {{ .Values.persistence.accessMode }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
diff --git a/auth/helm/aaf-hello/templates/aaf-hello.yaml b/auth/helm/aaf-hello/templates/aaf-hello.yaml
index 896ff35d..7bf35cde 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: {{.Values.cadi.port}}
-      nodePort: {{ .Values.cadi.public_port}}
+      port: {{ .Values.service.port }}
+      nodePort: {{ .Values.service.public_port }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -52,61 +52,51 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: aaf-hello-vol
-        emptyDir: {}
+        - name: aaf-hello-vol
+          persistentVolumeClaim:
+            claimName: aaf-hello-pvc
       initContainers:
         - name: aaf-hello-config
-          image: {{ .Values.image.repository }}onap/aaf/aaf_agent:{{ .Values.image.version }}
+          image: "{{ .Values.image.repository }}{{ .Values.service.initImage }}"
           imagePullPolicy: IfNotPresent
           volumeMounts:
-            - mountPath: "/opt/app/osaaf/local"
+            - mountPath: "/opt/app/osaaf"
               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 "]
+          command: ["bash","-c","exec /opt/app/aaf_config/bin/agent.sh"]
           env:
-            - name: aaf_env
-              value: "{{ .Values.cadi.aaf_env }}"
-            - name: cadi_latitude
-              value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: cadi_longitude
-              value: "{{ .Values.cadi.cadi_longitude }}"
+            - 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_locate_url
-              value: "https://aaf-locate.{{ .Release.Namespace }}:8095"
-            - name: aaf_locator_app_ns
-              value: "org.osaaf.aaf"
-            - name: "APP_FQDN"
-              value: "{{ .Values.cadi.fqdn }}"
-            - name: "APP_FQI"
-              value: "{{ .Values.cadi.fqi }}"
+            - 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"
               value: "demo123456!"
-# Hello specific.  Clients don't necessarily need this
-            - name: aaf_locator_public_fqdn
-              value: "{{.Values.cadi.public_fqdn}}"
-            - name: aaf_locator_name
-              value: "{{.Values.cadi.aaf_locator_name}}"
-            - name: aaf_locator_name_helm
-              value: "{{.Values.cadi.aaf_locator_name_helm}}"
-            - name: aaf_locator_fqdn_helm
-              value: "%N.%CNS"
 
 ###
 ### AAF-HELLO
 ###
       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 && sleep 240 && 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"
+        -  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 }}
diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml
index cc8765f5..da37ff63 100644
--- a/auth/helm/aaf-hello/values.yaml
+++ b/auth/helm/aaf-hello/values.yaml
@@ -23,38 +23,38 @@
 # Declare variables to be passed into your templates.
 
 global:
-  common:
-    namespace: "onap"
+  persistence:
+    enabled: "true"
 
 replicas:
   hello: 1
 
-cadi:
-  fqdn: "aaf-hello"
-  port: 8130
-  public_fqdn: "aaf.osaaf.org"
-# DUBLIN ONLY - for M4 compatibility with Casablanca
-  aaf_locator_name: "public.%NS.%N"
-  aaf_locator_name_helm: "%NS.%N"
-# EL ALTO and Beyond
-#  aaf_locator_name: "%NS.%N"
-#  aaf_locator_name_helm: "%CNS.%NS.%N"
-  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: {}
-
 image:
   # When using locally built Docker Container, set Repository to ""
   repository: ""
   # When using Docker Repo, add, and include trailing "/"
   # repository: nexus3.onap.org:10003/
   # repository: localhost:5000/
-  version: 2.1.15-SNAPSHOT
+
+service:
+  initImage: onap/aaf/aaf_agent:2.1.15-SNAPSHOT
+  image: onap/aaf/aaf_hello:2.1.15-SNAPSHOT
+  app_ns: "org.osaaf.aaf"
+  fqi: "aaf@aaf.osaaf.org"
+  fqdn: "aaf-hello"
+  public_fqdn: "aaf.osaaf.org"
+  port: "8130"
+  public_port: "30086"
+  cadi_latitude: "38.0"
+  cadi_longitude: "-72.0"
+
+persistence: 
+  # Where on local disk to store
+  mountPath: "/data/aaf/hello"
+  volumeReclaimPolicy: Retain
+  accessMode: ReadWriteOnce
+  size: 10M
+  storageClass: "manual"
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious