Merge "Fix inconsistent repository references"

diff --git a/charts/aai-cassandra/templates/volumes.yaml b/charts/aai-cassandra/templates/volumes.yaml
index 0e1a3df..f45a450 100644 (file)
--- a/charts/aai-cassandra/templates/volumes.yaml
+++ b/charts/aai-cassandra/templates/volumes.yaml
@@ -5,7 +5,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ $root.Values.service.name }}-{{ $i }}
+  name: {{ $root.Release.Name }}-{{ $root.Values.service.name }}-{{ $i }}
   namespace: {{ $root.Release.Namespace }}
   labels:
     type: {{ $root.Values.persistence.storageType }}
@@ -22,4 +22,4 @@ spec:
     path: {{ $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }}
   persistentVolumeReclaimPolicy: {{ $root.Values.persistence.volumeReclaimPolicy }}
 {{ end }}
-#{{ end }}
\ No newline at end of file
+#{{ end }}

diff --git a/charts/aai-resources/resources/config/aai_keystore b/charts/aai-resources/resources/config/aai_keystore
deleted file mode 100644 (file)
index 1ddef0c..0000000
Binary files a/charts/aai-resources/resources/config/aai_keystore and /dev/null differ

diff --git a/charts/aai-resources/resources/config/aaiconfig.properties b/charts/aai-resources/resources/config/aaiconfig.properties
index 0258fc2..41676cf 100644 (file)
--- a/charts/aai-resources/resources/config/aaiconfig.properties
+++ b/charts/aai-resources/resources/config/aaiconfig.properties
@@ -103,6 +103,8 @@ aai.transaction.logging=true
 aai.transaction.logging.get=false
 aai.transaction.logging.post=false
 
+aai.realtime.clients=SDNC,MSO,SO
+
 #timeout for crud enabled flag
 aai.crud.timeoutenabled=true
 

diff --git a/charts/aai-resources/templates/configmap.yaml b/charts/aai-resources/templates/configmap.yaml
index 5e371ea..373819e 100644 (file)
--- a/charts/aai-resources/templates/configmap.yaml
+++ b/charts/aai-resources/templates/configmap.yaml
@@ -53,12 +53,3 @@ metadata:
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/realm.properties").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-auth-secret
-  namespace: {{ include "common.namespace" . }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/config/aai_keystore").AsSecrets . | indent 2 }}

diff --git a/charts/aai-resources/templates/deployment.yaml b/charts/aai-resources/templates/deployment.yaml
index 6ed5a65..c6bb14c 100644 (file)
--- a/charts/aai-resources/templates/deployment.yaml
+++ b/charts/aai-resources/templates/deployment.yaml
@@ -34,6 +34,7 @@ spec:
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         msb.onap.org/service-info: '[
           {
               "serviceName": "_aai-cloudInfrastructure",
@@ -453,7 +454,7 @@ spec:
         - mountPath: /opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties
           name: {{ include "common.fullname" . }}-aaiconfig-conf
           subPath: aaiconfig.properties
-        - mountPath: /var/log/onap
+        - mountPath: /opt/aai/logroot/AAI-RES
           name: {{ include "common.fullname" . }}-logs
         - mountPath: /opt/app/aai-resources/resources/logback.xml
           name: {{ include "common.fullname" . }}-log-conf
@@ -542,7 +543,7 @@ spec:
          name: {{ include "common.fullname" . }}-realm-configmap
       - name: {{ include "common.fullname" . }}-auth-sec
         secret:
-         secretName: {{ include "common.fullname" . }}-auth-secret
+         secretName: aai-auth-secret
       restartPolicy: {{ .Values.restartPolicy }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"

diff --git a/charts/aai-traversal/resources/config/aai_keystore b/charts/aai-traversal/resources/config/aai_keystore
deleted file mode 100644 (file)
index 1ddef0c..0000000
Binary files a/charts/aai-traversal/resources/config/aai_keystore and /dev/null differ

diff --git a/charts/aai-traversal/resources/config/aaiconfig.properties b/charts/aai-traversal/resources/config/aaiconfig.properties
index 2452a1e..b095c4c 100644 (file)
--- a/charts/aai-traversal/resources/config/aaiconfig.properties
+++ b/charts/aai-traversal/resources/config/aaiconfig.properties
@@ -103,6 +103,8 @@ aai.transaction.logging=true
 aai.transaction.logging.get=false
 aai.transaction.logging.post=false
 
+aai.realtime.clients=SDNC,MSO,SO
+
 #timeout for traversal enabled flag
 aai.traversal.timeoutenabled=true
 

diff --git a/charts/aai-traversal/templates/configmap.yaml b/charts/aai-traversal/templates/configmap.yaml
index cc88444..373819e 100644 (file)
--- a/charts/aai-traversal/templates/configmap.yaml
+++ b/charts/aai-traversal/templates/configmap.yaml
@@ -53,12 +53,3 @@ metadata:
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/realm.properties").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-auth-secret
-  namespace: {{ include "common.namespace" . }}
-type: Opaque
-data:
-{{ tpl (.Files.Glob "resources/config/aai_keystore").AsSecrets . | indent 2 }}
\ No newline at end of file

diff --git a/charts/aai-traversal/templates/deployment.yaml b/charts/aai-traversal/templates/deployment.yaml
index 8e426e8..25cd3a9 100644 (file)
--- a/charts/aai-traversal/templates/deployment.yaml
+++ b/charts/aai-traversal/templates/deployment.yaml
@@ -34,6 +34,7 @@ spec:
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         msb.onap.org/service-info: '[
           {
               "serviceName": "_aai-generic-query",
@@ -287,7 +288,7 @@ spec:
         - mountPath: /opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties
           name: {{ include "common.fullname" . }}-aaiconfig-conf
           subPath: aaiconfig.properties
-        - mountPath: /var/log/onap
+        - mountPath: /opt/aai/logroot/AAI-GQ
           name: {{ include "common.fullname" . }}-logs
         - mountPath: /opt/app/aai-traversal/resources/logback.xml
           name: {{ include "common.fullname" . }}-log-conf
@@ -375,7 +376,7 @@ spec:
          name: {{ include "common.fullname" . }}-realm-configmap
       - name: {{ include "common.fullname" . }}-auth-sec
         secret:
-         secretName: {{ include "common.fullname" . }}-auth-secret
+         secretName: aai-auth-secret
       restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"

diff --git a/charts/aai-traversal/templates/job.yaml b/charts/aai-traversal/templates/job.yaml
index 8bb7a40..7d9f3a5 100644 (file)
--- a/charts/aai-traversal/templates/job.yaml
+++ b/charts/aai-traversal/templates/job.yaml
@@ -125,7 +125,7 @@ spec:
          name: {{ include "common.fullname" . }}-realm-configmap
       - name: {{ include "common.fullname" . }}-auth-sec
         secret:
-         secretName: {{ include "common.fullname" . }}-auth-secret
+         secretName: aai-auth-secret
       restartPolicy: OnFailure
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"

diff --git a/resources/config/aai/aai_keystore b/resources/config/aai/aai_keystore
new file mode 100644 (file)
index 0000000..16d93a7
Binary files /dev/null and b/resources/config/aai/aai_keystore differ

diff --git a/templates/configmap.yaml b/templates/configmap.yaml
index 592e412..00d2a80 100644 (file)
--- a/templates/configmap.yaml
+++ b/templates/configmap.yaml
@@ -13,6 +13,25 @@ metadata:
   name: aai-deployment-configmap
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/haproxy/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/haproxy/haproxy.cfg").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: aai-haproxy-secret
+  namespace: {{ include "common.namespace" . }}
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/haproxy/aai.pem").AsSecrets . | indent 2 }}
+# This is a shared key for both resources and traversal
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: aai-auth-secret
+  namespace: {{ include "common.namespace" . }}
+type: Opaque
+data:
+{{ tpl (.Files.Glob "resources/config/aai/aai_keystore").AsSecrets . | indent 2 }}
 
 

diff --git a/values.yaml b/values.yaml
index e879818..b29f8a2 100644 (file)
--- a/values.yaml
+++ b/values.yaml
@@ -57,7 +57,7 @@ global: # global defaults
 
 # application image
 dockerhubRepository: registry.hub.docker.com
-image: aaionap/haproxy:1.1.0
+image: aaionap/haproxy:1.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required