diff options
author | Mandeep Khinda <mandeep.khinda@amdocs.com> | 2017-08-25 03:31:17 +0000 |
---|---|---|
committer | Mandeep Khinda <mandeep.khinda@amdocs.com> | 2017-08-25 03:41:20 +0000 |
commit | 0e8f8899ca6fdc589316c59f90f8f7283bbfad49 (patch) | |
tree | 7c3ed2c2b519b365572ca4a3539320164511c4bd /kubernetes/portal/templates/portal-apps-deployment.yaml | |
parent | deab10d15301b12eee943d7c6151c4300ba2ac2a (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/portal/templates/portal-apps-deployment.yaml')
-rwxr-xr-x | kubernetes/portal/templates/portal-apps-deployment.yaml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index 23a645910a..a0818fab1b 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: portalapps - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: selector: matchLabels: @@ -102,45 +102,45 @@ spec: volumes: - name: portal-fusion-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties - name: portal-openid-connect-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties - name: portal-system-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties - name: portal-portal-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties - name: dbcapp-fusion-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties - name: dbcapp-system-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties - name: dbcapp-portal-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties - name: dbcapp-dbcapp-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties - name: sdkapp-system-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties - name: sdkapp-portal-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties - name: sdkapp-fusion-properties hostPath: - path: /dockerdata-nfs/onap/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties - name: portal-mariadb-onboarding-sql hostPath: - path: /dockerdata-nfs/onap/portal/mariadb/oom_updates.sql + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/oom_updates.sql - name: portal-root hostPath: - path: /dockerdata-nfs/onap/portal + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal - name: portal-logs hostPath: - path: /dockerdata-nfs/onap/portal/logs + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/logs imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" |