aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/mso
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/mso
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/mso')
-rw-r--r--kubernetes/mso/templates/all-services.yaml4
-rw-r--r--kubernetes/mso/templates/db-deployment.yaml8
-rw-r--r--kubernetes/mso/templates/mso-deployment.yaml8
-rw-r--r--kubernetes/mso/values.yaml2
4 files changed, 11 insertions, 11 deletions
diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml
index 6e2db71650..a0807d759e 100644
--- a/kubernetes/mso/templates/all-services.yaml
+++ b/kubernetes/mso/templates/all-services.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-mso"
labels:
app: mariadb
spec:
@@ -17,7 +17,7 @@ apiVersion: v1
kind: Service
metadata:
name: mso
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-mso"
labels:
app: mso
spec:
diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index ff1cf75350..76cf2ec912 100644
--- a/kubernetes/mso/templates/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-mso"
spec:
replicas: 1
selector:
@@ -43,9 +43,9 @@ spec:
volumes:
- name: mso-mariadb-conf
hostPath:
- path: /dockerdata-nfs/onap/mso/mariadb/conf.d
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/conf.d
- name: mso-mariadb-docker-entrypoint-initdb
hostPath:
- path: /dockerdata-nfs/onap/mso/mariadb/docker-entrypoint-initdb.d
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mariadb/docker-entrypoint-initdb.d
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index 6f12769d5a..0f3034f4cc 100644
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: mso
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-mso"
spec:
replicas: 1
selector:
@@ -68,9 +68,9 @@ spec:
volumes:
- name: mso
hostPath:
- path: /dockerdata-nfs/onap/mso/mso
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso
- name: mso-docker-files
hostPath:
- path: /dockerdata-nfs/onap/mso/docker-files
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml
index 41f9677029..1045224d43 100644
--- a/kubernetes/mso/values.yaml
+++ b/kubernetes/mso/values.yaml
@@ -1,4 +1,4 @@
-NS: onap-mso
+nsPrefix: onap
pullPolicy: IfNotPresent
image:
readiness: oomk8s/readiness-check:1.0.0