From 0e8f8899ca6fdc589316c59f90f8f7283bbfad49 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Fri, 25 Aug 2017 03:31:17 +0000
Subject: refactor helm files to use namespace prefix

-removed the full namespace from each template.  better lets us reuse
variables.
-made secret end up in a configurable namespace
-fixed some bugs where secrets were missing
-updated createAll and delete to make use of namespace prefix
removing the need for seds to replace the word onap.

*** all containers at this point come up in my env. except for
aai model loader which is failing cause its still at 1.0
and its trying to talk to a 1.1 sdc and it doesnt auth properly. ***

Issue-ID:OOM-215

Change-Id: I15815a01469786a391e272fde4bdaa53ff48091c
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---
 kubernetes/aai/templates/aai-deployment.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kubernetes/aai/templates/aai-deployment.yaml')

diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index 286a9aca53..162fb99bf9 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: aai-service
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-aai"
 spec:
   selector:
     matchLabels:
@@ -76,16 +76,16 @@ spec:
       volumes:
         - name: aai-service-certs
           hostPath:
-            path: /dockerdata-nfs/onap/aai/etc/ssl/certs/
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/etc/ssl/certs/
         - name: aai-service-logroot
           hostPath:
-            path: /dockerdata-nfs/onap/aai/opt/aai/logroot/
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/opt/aai/logroot/
         - name: aai-config
           hostPath:
-            path: /dockerdata-nfs/onap/aai/aai-config/
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/
         - name: aai-data
           hostPath:
-            path: /dockerdata-nfs/onap/aai/aai-data/
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/
       restartPolicy: Always
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-- 
cgit 1.2.3-korg