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/sdc/templates/sdc-be.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kubernetes/sdc/templates/sdc-be.yaml')

diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 96fee818da..38a239e714 100644
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: sdc-be
   name: sdc-be
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-sdc"
 spec:
   selector:
     matchLabels:
@@ -54,7 +54,7 @@ spec:
               "env": [
                   {
                       "name": "NAMESPACE",
-                      "value": "onap-message-router"
+                      "value": "{{ .Values.nsPrefix }}-message-router"
                   }
               ],
               "image": "{{ .Values.image.readiness }}",
@@ -96,18 +96,18 @@ spec:
       volumes:
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/onap/sdc/sdc-es/ES
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onap/sdc/environments
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
         - name: sdc-jetty-keystore
           hostPath:
-            path: /dockerdata-nfs/onap/sdc/jetty/keystore
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onap/sdc/logs
+            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-- 
cgit 1.2.3-korg