Create Helm based Certificates for Clients

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

15 files changed, 165 insertions, 46 deletions

diff --git a/auth/helm/.gitignore b/auth/helm/.gitignore
index 1c5fad92..44cae669 100644
--- a/auth/helm/.gitignore
+++ b/auth/helm/.gitignore
@@ -1,3 +1,4 @@
 aaf.orig/
 pause/
 aaf.new/
+aaf.props
diff --git a/auth/helm/aaf-hello/.helmignore b/auth/helm/aaf-hello/.helmignore
new file mode 100644
index 00000000..f0c13194
--- /dev/null
+++ b/auth/helm/aaf-hello/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/auth/helm/aaf-hello/Chart.yaml b/auth/helm/aaf-hello/Chart.yaml
new file mode 100644
index 00000000..3b23f6d0
--- /dev/null
+++ b/auth/helm/aaf-hello/Chart.yaml
@@ -0,0 +1,25 @@
+#########
+##  ============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====================================================
+##
+
+apiVersion: v1
+appVersion: "1.0"
+description: AAF Hello Helm Chart
+name: aaf-hello
+version: 2.1.11-SNAPSHOT
diff --git a/auth/helm/aaf/aaf.sh b/auth/helm/aaf-hello/aaf.sh
index 5bb83515..5bb83515 100644
--- a/auth/helm/aaf/aaf.sh
+++ b/auth/helm/aaf-hello/aaf.sh
diff --git a/auth/helm/aaf-hello/templates/NOTES.txt b/auth/helm/aaf-hello/templates/NOTES.txt
new file mode 100644
index 00000000..a6805571
--- /dev/null
+++ b/auth/helm/aaf-hello/templates/NOTES.txt
@@ -0,0 +1 @@
+AAF Persistence basics loaded
diff --git a/auth/helm/aaf/templates/aaf-hello.yaml b/auth/helm/aaf-hello/templates/aaf-hello.yaml
index 7c91c856..c114e5eb 100644
--- a/auth/helm/aaf/templates/aaf-hello.yaml
+++ b/auth/helm/aaf-hello/templates/aaf-hello.yaml
@@ -52,63 +52,51 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: {{ .Chart.Name }}-config-vol
-        persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-config-pvc
-      - name: {{ .Chart.Name }}-status-vol
-        persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-status-pvc
+      - name: hello-config-vol
+        emptyDir: {}
       initContainers:
-        - name: {{ .Chart.Name }}-config-container
-          image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
+        - name: hello-config-container
+          image: {{ .Values.image.repository }}onap/aaf/aaf_agent:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
-          command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
           volumeMounts:
-            - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
+            - 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"]
           env:
-            - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_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: aaf_locator_container
-              value: "helm"
-            - name: aaf_locator_container_ns
+            - name: "CONTAINER_NS"
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: aaf_locate_url
-              value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
-              value: "aaf.osaaf.org"
-#            - name: CASSANDRA_USER
-#              value: ""
-#            - name: CASSANDRA_PASSWORD
-#              value: ""
-#           - name: CASSANDRA_PORT
-#              value: ""
-      containers:
+            - name: "DEPLOY_FQI"
+              value: "deployer@people.osaaf.org"
+            - name: "DEPLOY_PASSWORD"
+              value: "demo123456!"
+
 ###
 ### AAF-HELLO
 ###
-      - name: {{ .Chart.Name }}-hello
+      containers:
+      - name: aaf-hello
         image: {{ .Values.image.repository }}onap/aaf/aaf_hello:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && exec bin/hello"]
         volumeMounts:
-        -  mountPath: "/opt/app/osaaf"
-           name: {{ .Chart.Name }}-config-vol
-        -  mountPath: "/opt/app/aaf/status"
-           name: {{ .Chart.Name }}-status-vol
+        -  mountPath: "/opt/app/osaaf/local"
+           name: hello-config-vol
         ports:
         - name: aaf-hello
           protocol: TCP
           containerPort: 8130
-        env:
-        - name: aaf_locator_ns
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
 
diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml
new file mode 100644
index 00000000..d5fa7476
--- /dev/null
+++ b/auth/helm/aaf-hello/values.yaml
@@ -0,0 +1,77 @@
+#########
+##  ============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====================================================
+##
+#
+# Default values for aaf.
+# This is a YAML-formatted file.
+# 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"
+  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"
+
+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.11-SNAPSHOT
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #  cpu: 100m
+  #  memory: 128Mi
+  # requests:
+  #  cpu: 100m
+  #  memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/auth/helm/aaf/templates/cass_pv.yaml b/auth/helm/aaf/templates/aaf-cass-pv.yaml
index 48633a21..48633a21 100644
--- a/auth/helm/aaf/templates/cass_pv.yaml
+++ b/auth/helm/aaf/templates/aaf-cass-pv.yaml
diff --git a/auth/helm/aaf/templates/cass_pvc.yaml b/auth/helm/aaf/templates/aaf-cass-pvc.yaml
index 9fcbe339..9fcbe339 100644
--- a/auth/helm/aaf/templates/cass_pvc.yaml
+++ b/auth/helm/aaf/templates/aaf-cass-pvc.yaml
diff --git a/auth/helm/aaf/templates/config_pv.yaml b/auth/helm/aaf/templates/aaf-config-pv.yaml
index 7066f520..7066f520 100644
--- a/auth/helm/aaf/templates/config_pv.yaml
+++ b/auth/helm/aaf/templates/aaf-config-pv.yaml
diff --git a/auth/helm/aaf/templates/config_pvc.yaml b/auth/helm/aaf/templates/aaf-config-pvc.yaml
index 9136712b..9136712b 100644
--- a/auth/helm/aaf/templates/config_pvc.yaml
+++ b/auth/helm/aaf/templates/aaf-config-pvc.yaml
diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml
index 2a509b76..dcff5e7b 100644
--- a/auth/helm/aaf/templates/aaf-gui.yaml
+++ b/auth/helm/aaf/templates/aaf-gui.yaml
@@ -31,8 +31,9 @@ spec:
   ports:
     - name: aaf-gui
       protocol: TCP
-      port: 8200
       nodePort: 30083
+      port: 8200
+      targetPort: 8200
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/auth/helm/aaf/templates/status_pv.yaml b/auth/helm/aaf/templates/aaf-status-pv.yaml
index 418a368b..418a368b 100644
--- a/auth/helm/aaf/templates/status_pv.yaml
+++ b/auth/helm/aaf/templates/aaf-status-pv.yaml
diff --git a/auth/helm/aaf/templates/status_pvc.yaml b/auth/helm/aaf/templates/aaf-status-pvc.yaml
index 2a402ff9..2a402ff9 100644
--- a/auth/helm/aaf/templates/status_pvc.yaml
+++ b/auth/helm/aaf/templates/aaf-status-pvc.yaml
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index 7556f251..abea8902 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -35,7 +35,6 @@ replicas:
   oauth: 1
   cm: 1
   gui: 1
-  hello: 0
 
 ingress:
   enabled: false
@@ -49,11 +48,11 @@ cadi:
 persistence:
   # Note: Minikube will persist to /data on your host machine
   mountPath: "/data/aaf"
-  config:
+  cass:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteOnce
-    size: 2Gi
-    mountSubPath: "config"
+    size: 10Gi
+    mountSubPath: "cass"
     storageClass: "manual"
   status:
     volumeReclaimPolicy: Delete
@@ -61,11 +60,17 @@ persistence:
     size: 10M
     mountSubPath: "status"
     storageClass: "manual"
-  cass:
+  config:
     volumeReclaimPolicy: Retain
     accessMode: ReadWriteOnce
-    size: 10Gi
-    mountSubPath: "cass"
+    size: 2Gi
+    mountSubPath: "config"
+    storageClass: "manual"
+  hello:
+    volumeReclaimPolicy: Retain
+    accessMode: ReadWriteOnce
+    size: 1Gi
+    mountSubPath: "config"
     storageClass: "manual"
 
 image: