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/appc/templates/all-services.yaml         | 10 +++++-----
 kubernetes/appc/templates/appc-deployment.yaml      |  8 ++++----
 kubernetes/appc/templates/db-deployment.yaml        |  6 +++---
 kubernetes/appc/templates/dgbuilder-deployment.yaml |  4 ++--
 kubernetes/appc/values.yaml                         |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'kubernetes/appc')

diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml
index 939ef7fba7..95472319ed 100644
--- a/kubernetes/appc/templates/all-services.yaml
+++ b/kubernetes/appc/templates/all-services.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: dbhost
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
   labels:
     app: appc-dbhost
 spec:
@@ -17,7 +17,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: sdnctldb01
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
   labels:
     app: appc-dbhost
 spec:
@@ -31,7 +31,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: sdnctldb02
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
   labels:
     app: appc-dbhost
 spec:
@@ -45,7 +45,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: sdnhost
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
   labels:
     app: appc
 spec:
@@ -65,7 +65,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: dgbuilder
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
   labels:
     app: appc-dgbuilder
 spec:
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 0bd93f8fb6..049ac5d457 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: appc
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
 spec:
   selector:
     matchLabels:
@@ -70,9 +70,9 @@ spec:
       volumes:
         - name: appc-conf
           hostPath:
-            path: /dockerdata-nfs/onap/appc/conf
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf
         - name: sdnc-conf
           hostPath:
-            path: /dockerdata-nfs/onap/sdnc/conf
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/appc/templates/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml
index f7b55187a0..239d76f083 100644
--- a/kubernetes/appc/templates/db-deployment.yaml
+++ b/kubernetes/appc/templates/db-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: appc-dbhost
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
 spec:
   selector:
     matchLabels:
@@ -35,6 +35,6 @@ spec:
       volumes:
       - name: appc-data
         hostPath:
-          path: /dockerdata-nfs/onap/appc/data
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/data
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml
index 54bf596a97..e0342578bf 100644
--- a/kubernetes/appc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: appc-dgbuilder
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-appc"
 spec:
   selector:
     matchLabels:
@@ -65,4 +65,4 @@ spec:
           periodSeconds: 10
       restartPolicy: Always
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 22000a7a36..74b189f371 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -1,4 +1,4 @@
-NS: onap-appc
+nsPrefix: onap
 pullPolicy: Always
 image:
   readiness: oomk8s/readiness-check:1.0.0
-- 
cgit 1.2.3-korg