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-vnc-dep.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-vnc-dep.yaml')
| -rw-r--r-- | kubernetes/portal/templates/portal-vnc-dep.yaml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml index e4a8574458..fb7bd93e44 100644 --- a/kubernetes/portal/templates/portal-vnc-dep.yaml +++ b/kubernetes/portal/templates/portal-vnc-dep.yaml @@ -4,7 +4,7 @@ metadata: labels: app: vnc-portal name: vnc-portal - namespace: {{ .Values.NS }} + namespace: "{{ .Values.nsPrefix }}-portal" spec: selector: matchLabels: @@ -50,7 +50,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-policy" + "value": "{{ .Values.nsPrefix }}-policy" } ], "image": "{{ .Values.image.readiness }}", @@ -68,7 +68,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-sdc" + "value": "{{ .Values.nsPrefix }}-sdc" } ], "image": "{{ .Values.image.readiness }}", @@ -86,7 +86,7 @@ spec: "env": [ { "name": "NAMESPACE", - "value": "onap-vid" + "value": "{{ .Values.nsPrefix }}-vid" } ], "image": "{{ .Values.image.readiness }}", @@ -95,7 +95,7 @@ spec: }, { "command": ["/bin/sh","-c"], - "args": ["echo `host sdc-be.onap-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.onap-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.onap-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.onap-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.onap-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.onap-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"], + "args": ["echo `host sdc-be.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.api.be.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host portalapps.{{ .Values.nsPrefix }}-portal | awk ''{print$4}''` portal.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host pap.{{ .Values.nsPrefix }}-policy | awk ''{print$4}''` policy.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sdc-fe.{{ .Values.nsPrefix }}-sdc | awk ''{print$4}''` sdc.ui.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host vid-server.{{ .Values.nsPrefix }}-vid | awk ''{print$4}''` vid.api.simpledemo.openecomp.org >> /ubuntu-init/hosts; echo `host sparky-fe.{{ .Values.nsPrefix }}-aai | awk ''{print$4}''` aai.api.simpledemo.openecomp.org >> /ubuntu-init/hosts"], "image": "{{ .Values.image.ubuntuInit }}", "imagePullPolicy": "{{ .Values.pullPolicy }}", "name": "vnc-init-hosts", @@ -118,7 +118,6 @@ spec: env: - name: VNC_PASSWORD value: password - imagePullPolicy: IfNotPresent name: vnc-portal volumeMounts: - mountPath: /ubuntu-init/ @@ -130,4 +129,4 @@ spec: - name: ubuntu-init emptyDir: {} imagePullSecrets: - - name: onap-docker-registry-key + - name: "{{ .Values.nsPrefix }}-docker-registry-key" |