AAF 2.1.15 Dockers, again

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

10 files changed, 30 insertions, 31 deletions

diff --git a/kubernetes/aaf/charts/aaf-cass/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cass/templates/deployment.yaml
index 3ad86ba098..5bbb1d731f 100644
--- a/kubernetes/aaf/charts/aaf-cass/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-cass/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
       - name: {{ include "common.name" . }}
-        image: {{ .Values.global.repository }}/{{.Values.global.cassImage}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.cass.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         # installing with cmd "onap" will not only initialize the DB, but add ONAP bootstrap data as well
         command: ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh","onap"]
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
index b197e31096..19d762557a 100644
--- a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-config-container
-        image: {{ .Values.global.repository }}/{{.Values.global.configImage}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service remove && bin/agent.sh"]
         volumeMounts:
@@ -76,7 +76,7 @@ spec:
       containers:
       - name: {{ include "common.name" . }}
         command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"]
-        image: {{ .Values.global.repository }}/{{.Values.global.image}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
index 3905471c71..cd72fddb58 100644
--- a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-config-container
-        image: {{ .Values.global.repository }}/{{.Values.global.configImage}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service remove && bin/agent.sh"]
         volumeMounts:
@@ -76,7 +76,7 @@ spec:
       containers:
       - name: {{ include "common.name" . }}
         command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"]
-        image: {{ .Values.global.repository }}/{{.Values.global.image}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
index 15a03fecdc..4a433cccfd 100644
--- a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-config-container
-        image: {{ .Values.global.repository }}/{{.Values.global.configImage}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service remove && bin/agent.sh"]
         volumeMounts:
@@ -76,7 +76,7 @@ spec:
       containers:
       - name: {{ include "common.name" . }}
         command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"]  
-        image: {{ .Values.global.repository }}/{{.Values.global.image}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
index 0ec768b99d..c5fcf68a58 100644
--- a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
       initContainers:
       - name: {{ include "common.name" . }}-config
-        image: {{ .Values.global.repository }}/{{.Values.service.agentImage}}
+        image: {{ .Values.global.repository }}/{{.Values.aaf_init.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
@@ -49,7 +49,7 @@ spec:
         command: ["bash","-c","exec /opt/app/aaf_config/bin/agent.sh"]
         env:
           - name: APP_FQI
-            value: "{{ .Values.service.fqi }}"
+            value: "{{ .Values.aaf_init.fqi }}"
           - name: aaf_locate_url
             value: "https://aaf-locate.{{ .Release.Namespace}}:8095"
           - name: aaf_locator_container
@@ -57,9 +57,9 @@ spec:
           - name: aaf_locator_container_ns
             value: "{{ .Release.Namespace }}"
           - name: aaf_locator_fqdn
-            value: "{{ .Values.service.fqdn }}"
+            value: "{{ .Values.aaf_init.fqdn }}"
           - name: aaf_locator_app_ns
-            value: "{{ .Values.service.app_ns }}"
+            value: "{{ .Values.aaf_init.app_ns }}"
           - name: DEPLOY_FQI
             value: "deployer@people.osaaf.org"
 # Note: We want to put this in Secrets or at LEAST ConfigMaps
@@ -67,9 +67,9 @@ spec:
             value: "demo123456!"
 # Note: want to put this on Nodes, evenutally
           - name: cadi_longitude
-            value: "{{ .Values.service.cadi_longitude }}"
+            value: "{{ .Values.aaf_init.cadi_longitude }}"
           - name: cadi_latitude
-            value: "{{ .Values.service.cadi_latitude }}"
+            value: "{{ .Values.aaf_init.cadi_latitude }}"
 # Hello specific.  Clients don't don't need this, unless Registering with AAF Locator
           - name: aaf_locator_public_fqdn
             value: "{{.Values.global.aaf.public_fqdn}}"
diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml
index 15b6039b59..ea6665c61a 100644
--- a/kubernetes/aaf/charts/aaf-hello/values.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/values.yaml
@@ -24,22 +24,24 @@ flavor: small
 # Application configuration defaults.
 #################################################################
 # application image
-service:
+aaf_init:
   # You might want this in your own app.  For AAF, we store in global
   # replicas: 1
   fqdn: "aaf-hello"
-  agentImage: onap/aaf/aaf_agent:2.1.15-SNAPSHOT
-  image: onap/aaf/aaf_hello:2.1.15-SNAPSHOT
+  image: onap/aaf/aaf_agent:2.1.15
   app_ns: "org.osaaf.aaf"
   fqi: "aaf@aaf.osaaf.org"
   fqdn: "aaf-hello"
   public_fqdn: "aaf.osaaf.org"
-  port: "8130"
-  public_port: "31116"
   deploy_fqi: "deployer@people.osaaf.org"
   cadi_latitude: "38.0"
   cadi_longitude: "-72.0"
 
+service:
+  image: onap/aaf/aaf_hello:2.1.15
+  port: "8130"
+  public_port: "31119"
+
 persistence:
   enabled: true
   config:
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
index 76dbbe54a0..69d16121c9 100644
--- a/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-config-container
-        image: {{ .Values.global.repository }}/{{.Values.global.configImage}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service remove && bin/agent.sh"]
         volumeMounts:
@@ -76,7 +76,7 @@ spec:
       containers:
       - name: {{ include "common.name" . }}
         command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate aaf-service && exec bin/locate"]
-        image: {{ .Values.global.repository }}/{{.Values.global.image}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
index ad22245669..b371c86541 100644
--- a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-config-container
-        image: {{ .Values.global.repository }}/{{.Values.global.configImage}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service remove && bin/agent.sh"]
         volumeMounts:
@@ -76,7 +76,7 @@ spec:
       containers:
       - name: {{ include "common.name" . }}
         command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"]
-        image: {{ .Values.global.repository }}/{{.Values.global.image}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: "/opt/app/osaaf"
diff --git a/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
index f7603967ea..1c09718262 100644
--- a/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       initContainers:
       - name: {{ include "common.name" . }}-config-container
-        image: {{ .Values.global.repository }}/{{.Values.global.configImage}}
+        image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config nc aaf-cass.{{ .Release.Namespace }} 9042 sleep 15 remove && bin/agent.sh"]
         volumeMounts:
@@ -76,7 +76,7 @@ spec:
       containers:
       - name: {{ include "common.name" . }}
         command: ["/bin/bash","-c","cd /opt/app/aaf  && bin/pod_wait.sh aaf-service aaf-cass  && exec bin/service"]
-        image: {{.Values.global.repository}}/{{.Values.global.image}}
+        image: {{.Values.global.repository}}/{{.Values.global.aaf.image}}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
           - name: cm_always_ignore_ips
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index a1bb0aa16d..0109a5e90d 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -31,15 +31,9 @@ global:
   #pullPolicy: IfNotPresent
   #repository: "nexus3.onap.org:10003"
 
-  # Images
-  image: onap/aaf/aaf_core:2.1.15-SNAPSHOT
-  configImage: onap/aaf/aaf_config:2.1.15-SNAPSHOT
-  cassImage: onap/aaf/aaf_cass:2.1.15-SNAPSHOT
-  agentImage: onap/aaf/aaf_agent:2.1.15-SNAPSHOT
-  helloImage: onap/aaf/aaf_hello:2.1.15-SNAPSHOT
-
   aaf:
     readiness: false
+    image: onap/aaf/aaf_core:2.1.15
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
     aaf_release: "El Alto"
@@ -53,8 +47,11 @@ global:
     cadi_longitude: "-72.0"
     cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
 
+    config:
+      image: onap/aaf/aaf_config:2.1.15
     cass:
       replicas: 1
+      image: onap/aaf/aaf_cass:2.1.15
       fqdn: "aaf-cass"
       cluster_name: "osaaf"
       heap_new_size: "512M"