Using the master tag for xossh and providing an override file
Change-Id: I61aa0ad903da55ad2ea745bc022bd94524c5aada
diff --git a/examples/xossh-candidate.yaml b/examples/xossh-candidate.yaml
new file mode 100644
index 0000000..fe1e848
--- /dev/null
+++ b/examples/xossh-candidate.yaml
@@ -0,0 +1,18 @@
+---
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# tools
+xosshImage: 'xosproject/xos-client:candidate'
+imagePullPolicy: 'Always'
\ No newline at end of file
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: {}