aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2017-08-25 03:31:17 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-08-25 03:41:20 +0000
commit0e8f8899ca6fdc589316c59f90f8f7283bbfad49 (patch)
tree7c3ed2c2b519b365572ca4a3539320164511c4bd /kubernetes/sdnc
parentdeab10d15301b12eee943d7c6151c4300ba2ac2a (diff)
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>
Diffstat (limited to 'kubernetes/sdnc')
-rw-r--r--kubernetes/sdnc/templates/all-services.yaml12
-rw-r--r--kubernetes/sdnc/templates/db-deployment.yaml6
-rw-r--r--kubernetes/sdnc/templates/dgbuilder-deployment.yaml4
-rw-r--r--kubernetes/sdnc/templates/sdnc-deployment.yaml6
-rw-r--r--kubernetes/sdnc/templates/web-deployment.yaml4
-rw-r--r--kubernetes/sdnc/values.yaml2
6 files changed, 17 insertions, 17 deletions
diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml
index af42db3063..311bd7b407 100644
--- a/kubernetes/sdnc/templates/all-services.yaml
+++ b/kubernetes/sdnc/templates/all-services.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: dbhost
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
labels:
app: sdnc-dbhost
spec:
@@ -16,7 +16,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnctldb01
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
labels:
app: sdnc-dbhost
spec:
@@ -30,7 +30,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnctldb02
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
labels:
app: sdnc-dbhost
spec:
@@ -44,7 +44,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnc-dgbuilder
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
labels:
app: sdnc-dgbuilder
spec:
@@ -61,7 +61,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnhost
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
labels:
app: sdnc
spec:
@@ -78,7 +78,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnc-portal
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
labels:
app: sdnc-portal
spec:
diff --git a/kubernetes/sdnc/templates/db-deployment.yaml b/kubernetes/sdnc/templates/db-deployment.yaml
index 1a2ecbae66..fc692ba58e 100644
--- a/kubernetes/sdnc/templates/db-deployment.yaml
+++ b/kubernetes/sdnc/templates/db-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: sdnc-dbhost
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
spec:
selector:
matchLabels:
@@ -35,6 +35,6 @@ spec:
volumes:
- name: sdnc-data
hostPath:
- path: /dockerdata-nfs/onapdemo/sdnc/data
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/data
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
index 367043337b..6d911c3381 100644
--- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
+++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: sdnc-dgbuilder
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
spec:
selector:
matchLabels:
@@ -63,4 +63,4 @@ spec:
periodSeconds: 10
restartPolicy: Always
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml
index eb1fdc89fb..cb296da498 100644
--- a/kubernetes/sdnc/templates/sdnc-deployment.yaml
+++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: sdnc
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
spec:
selector:
matchLabels:
@@ -63,6 +63,6 @@ spec:
volumes:
- name: sdnc-conf
hostPath:
- path: /dockerdata-nfs/onapdemo/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/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml
index 280bf25400..a141e765dc 100644
--- a/kubernetes/sdnc/templates/web-deployment.yaml
+++ b/kubernetes/sdnc/templates/web-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: sdnc-portal
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-sdnc"
spec:
selector:
matchLabels:
@@ -63,4 +63,4 @@ spec:
periodSeconds: 10
restartPolicy: Always
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index b9b3c0479f..5e17a96a5d 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -1,4 +1,4 @@
-NS: onap-sdnc
+nsPrefix: onap
pullPolicy: Always
image:
readiness: oomk8s/readiness-check:1.0.0