Refine Container Startup

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

4 files changed, 92 insertions, 8 deletions

diff --git a/auth/helm/aaf/aaf.sh b/auth/helm/aaf/aaf.sh
new file mode 100644
index 00000000..5bb83515
--- /dev/null
+++ b/auth/helm/aaf/aaf.sh
@@ -0,0 +1,84 @@
+. ../../docker/d.props
+IMAGE=onap/aaf/aaf_agent:$VERSION
+
+kubectl -n onap run -it --rm aaf-agent-$USER --image=$IMAGE --overrides='
+{
+    "spec": {
+        "containers": [
+            {
+                "name": "aaf-agent-'$USER'",
+		"image": "'$IMAGE'",
+                "imagePullPolicy": "IfNotPresent",
+		"command": [
+                   "bash", 
+		   "-c",
+                   "/opt/app/aaf_config/bin/agent.sh && cd /opt/app/osaaf/local && exec bash"
+                 ],
+                "env": [
+                   {
+                     "name": "aaf_locator_container",
+                     "value": "helm"
+		   },{
+                     "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": "'$LATITUDE'"
+		   },{
+                     "name": "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,
+                "tty": true,
+                "volumeMounts": [
+                    {
+                        "mountPath": "/opt/app/osaaf",
+                        "name": "aaf-config-vol"
+                    },
+                    {
+                        "mountPath": "/opt/app/aaf/status",
+                        "name": "aaf-status-vol"
+                    }
+                ]
+            }
+        ],
+      "volumes": [
+            {
+                "name": "aaf-config-vol",
+                "persistentVolumeClaim": {
+                    "claimName": "aaf-config-pvc"
+                }
+            },
+            {
+                "name": "aaf-status-vol",
+                "persistentVolumeClaim": {
+                    "claimName": "aaf-status-pvc"
+                }
+            }
+        ]
+   }
+}
+' --restart=Never  -- bash 
diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index 999b8d13..d53e9201 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-fs
 spec:
-  replicas: 0
+  replicas: {{ .Values.replicas.fs }}
   selector:
     matchLabels:
       app: aaf-fs
diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml
index 1e05dcb7..b09c80b8 100644
--- a/auth/helm/aaf/templates/aaf-locate.yaml
+++ b/auth/helm/aaf/templates/aaf-locate.yaml
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-locate
 spec:
-  replicas: 0
+  replicas: {{ .Values.replicas.locate }}
   selector:
     matchLabels:
       app: aaf-locate
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index 417e9fb5..7556f251 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -30,11 +30,11 @@ global:
 
 replicas:
   cass: 1
-  service: 0
-  locator: 0
-  oauth: 0
-  cm: 0
-  gui: 0
+  service: 1
+  locator: 1
+  oauth: 1
+  cm: 1
+  gui: 1
   hello: 0
 
 ingress:
@@ -56,7 +56,7 @@ persistence:
     mountSubPath: "config"
     storageClass: "manual"
   status:
-    volumeReclaimPolicy: Retain
+    volumeReclaimPolicy: Delete
     accessMode: ReadWriteOnce
     size: 10M
     mountSubPath: "status"