aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/vid/templates
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/vid/templates
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/vid/templates')
-rw-r--r--kubernetes/vid/templates/all-services.yaml4
-rw-r--r--kubernetes/vid/templates/vid-mariadb-deployment.yaml10
-rw-r--r--kubernetes/vid/templates/vid-server-deployment.yaml18
3 files changed, 16 insertions, 16 deletions
diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml
index 1018dedb2b..c0856711bb 100644
--- a/kubernetes/vid/templates/all-services.yaml
+++ b/kubernetes/vid/templates/all-services.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: vid-mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-vid"
spec:
ports:
- name: vid-mariadb
@@ -17,7 +17,7 @@ metadata:
labels:
app: vid-server
name: vid-server
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-vid"
spec:
ports:
- name: vid-server
diff --git a/kubernetes/vid/templates/vid-mariadb-deployment.yaml b/kubernetes/vid/templates/vid-mariadb-deployment.yaml
index cf3b8a22e0..7623674ee9 100644
--- a/kubernetes/vid/templates/vid-mariadb-deployment.yaml
+++ b/kubernetes/vid/templates/vid-mariadb-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: vid-mariadb
name: vid-mariadb
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-vid"
spec:
selector:
matchLabels:
@@ -45,12 +45,12 @@ spec:
volumes:
- name: vid-mariadb-data
hostPath:
- path: /dockerdata-nfs/onap/vid/mariadb/data
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/mariadb/data
- name: vid-pre-init
hostPath:
- path: /dockerdata-nfs/onap/vid/vid/lf_config/vid-pre-init.sql
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/vid/lf_config/vid-pre-init.sql
- name: my-cnf
hostPath:
- path: /dockerdata-nfs/onap/vid/vid/lf_config/vid-my.cnf
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/vid/vid/lf_config/vid-my.cnf
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 58ce80b80b..c535b440c1 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
labels:
app: vid-server
name: vid-server
- namespace: {{ .Values.NS }}
+ namespace: "{{ .Values.nsPrefix }}-vid"
spec:
selector:
matchLabels:
@@ -44,19 +44,19 @@ spec:
containers:
- env:
- name: ASDC_CLIENT_REST_HOST
- value: sdc-be.onap-sdc
+ value: sdc-be.{{ .Values.nsPrefix }}-sdc
- name: ASDC_CLIENT_REST_AUTH
value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
- name: ASDC_CLIENT_REST_PORT
value: "8080"
- name: VID_AAI_HOST
- value: aai-service.onap-aai
+ value: aai-service.{{ .Values.nsPrefix }}-aai
- name: VID_AAI_PORT
value: "8443"
- name: VID_ECOMP_SHARED_CONTEXT_REST_URL
- value: http://portalapps.onap-portal:8989/ECOMPPORTAL/context
+ value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/context
- name: VID_MSO_SERVER_URL
- value: http://mso.onap-mso:8080
+ value: http://mso.{{ .Values.nsPrefix }}-mso:8080
- name: VID_MSO_PASS
value: 51515201a8d4c5c08d533db9bd1e1a9b
- name: MSO_DME2_SERVER_URL
@@ -64,13 +64,13 @@ spec:
- name: MSO_DME2_ENABLED
value: "false"
- name: VID_ECOMP_REDIRECT_URL
- value: http://portalapps.onap-portal:8989/ECOMPPORTAL/login.htm
+ value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/login.htm
- name: VID_ECOMP_REST_URL
- value: http://portalapps.onap-portal:8989/ECOMPPORTAL/auxapi
+ value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ECOMPPORTAL/auxapi
- name: VID_CONTACT_US_LINK
value: https://todo_contact_us_link.com
- name: VID_UEB_URL_LIST
- value: dmaap.onap-message-router
+ value: dmaap.{{ .Values.nsPrefix }}-message-router
- name: VID_MYSQL_HOST
value: vid-mariadb
- name: VID_MYSQL_PORT
@@ -94,4 +94,4 @@ spec:
initialDelaySeconds: 5
periodSeconds: 10
imagePullSecrets:
- - name: onap-docker-registry-key
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"