[CORD-3198]
Use released versions in charts
Change-Id: I6600afc520e2dcf7d52369500da1925e3686861d
diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index b9b1487..73156ad 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
name: xos-core
-version: 1.0.0
+version: 2.0.0
diff --git a/xos-core/requirements.yaml b/xos-core/requirements.yaml
index f77c942..d751508 100644
--- a/xos-core/requirements.yaml
+++ b/xos-core/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: xos-gui
- version: 0.1.0
+ version: 1.0.0
repository: file://../xos-gui
condition: xos-gui.enabled
diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index df280b5..d61cdd9 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -28,7 +28,7 @@
spec:
containers:
- name: xos-chameleon
- image: {{ .Values.xos_chameleonImage | quote }}
+ image: {{ tpl .Values.xos_chameleonImage . | quote }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
command: ["python", "chameleon/chameleon/main.py", "-R", "9101", "-G", "xos-core:50055", "--swagger-url", "/apidocs", "-r"]
ports:
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index 64bf9f6..54b2a5a 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.yaml
@@ -28,7 +28,7 @@
spec:
containers:
- name: xos-core
- image: {{ .Values.xos_coreImage | quote }}
+ image: {{ tpl .Values.xos_coreImage . | quote }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
command: ["/bin/bash", "-c", "cd coreapi; ./start_coreapi.sh"]
ports:
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 6cb8a46..c6e5105 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -24,10 +24,10 @@
# Docker images
# YAML variable names can't contain `-`, so substituted with `_`
-xos_coreImage: 'xosproject/xos-core:master'
-xos_chameleonImage: 'xosproject/chameleon:master'
-xos_toscaImage: 'xosproject/xos-tosca:master'
-xos_api_testerImage: 'xosproject/xos-api-tester:master'
+xos_coreImage: 'xosproject/xos-core:{{ .Chart.Version }}'
+xos_chameleonImage: 'xosproject/chameleon:{{ .Chart.Version }}'
+xos_toscaImage: 'xosproject/xos-tosca:1.0.1'
+xos_api_testerImage: 'xosproject/xos-api-tester:2.0.1'
postgresImage: 'postgres:10.3-alpine'
nodeImage: 'node:7.9.0'