Revert "XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy"
This reverts commit 1f58c2afbd680c8c618bff6f66e9982515dd1caf.
Change-Id: I0d7ef37a420168276472675b005482d6d11daabd
diff --git a/xos-gui/templates/gui-deployment.yaml b/xos-gui/templates/gui-deployment.yaml
index d8d8b13..153a6bf 100644
--- a/xos-gui/templates/gui-deployment.yaml
+++ b/xos-gui/templates/gui-deployment.yaml
@@ -28,8 +28,8 @@
spec:
containers:
- name: xos-gui
- image: {{ .Values.global.registry }}{{ .Values.images.xos_gui.repository }}:{{ tpl .Values.images.xos_gui.tag . }}
- imagePullPolicy: {{ .Values.images.xos_gui.pullPolicy }}
+ image: {{ tpl .Values.xos_guiImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
ports:
- containerPort: 4000
port: 4000
diff --git a/xos-gui/templates/ws-deployment.yaml b/xos-gui/templates/ws-deployment.yaml
index e10d0f8..9d958bb 100644
--- a/xos-gui/templates/ws-deployment.yaml
+++ b/xos-gui/templates/ws-deployment.yaml
@@ -28,8 +28,8 @@
spec:
containers:
- name: xos-ws
- image: {{ .Values.global.registry }}{{ .Values.images.xos_ws.repository }}:{{ tpl .Values.images.xos_ws.tag . }}
- imagePullPolicy: {{ .Values.images.xos_ws.pullPolicy }}
+ image: {{ .Values.xos_wsImage | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
command: ["npm", "start", "--", "--config", "gateway-config.yml"]
ports:
- containerPort: 3000