Using the master tag for xossh and providing an override file
Change-Id: I61aa0ad903da55ad2ea745bc022bd94524c5aada
diff --git a/xos-tools/xossh/README.md b/xos-tools/xossh/README.md
index 95358d3..9d08a67 100644
--- a/xos-tools/xossh/README.md
+++ b/xos-tools/xossh/README.md
@@ -7,3 +7,9 @@
# wait a few seconds for the container to start, then run the following
xos-tools/xossh/xossh-attach.sh
```
+
+To deploy a development version of `xossh` tagged with the `candidate` tag, you can do:
+
+```
+helm install xos-tools/xossh/ -n xossh -f examples/xossh-candidate.yaml
+```
diff --git a/xos-tools/xossh/templates/deployment.yaml b/xos-tools/xossh/templates/deployment.yaml
index 242e302..8859f74 100644
--- a/xos-tools/xossh/templates/deployment.yaml
+++ b/xos-tools/xossh/templates/deployment.yaml
@@ -46,8 +46,8 @@
- "{{ .Values.xosshConfig.accessor.endpoint }}"
stdin: true
tty: true
- image: "{{ .Values.pull_docker_registry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: "{{ .Values.xosshImage }}"
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
resources:
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
diff --git a/xos-tools/xossh/values.yaml b/xos-tools/xossh/values.yaml
index 9fcdf22..6ed3137 100644
--- a/xos-tools/xossh/values.yaml
+++ b/xos-tools/xossh/values.yaml
@@ -25,10 +25,9 @@
nameOverride: ""
fullnameOverride: ""
-image:
- repository: xosproject/xos-client
- tag: candidate
- pullPolicy: IfNotPresent
+imagePullPolicy: IfNotPresent
+
+xosshImage: 'xosproject/xos-client:master'
resources: {}