Moving xos-core to master
Change-Id: I596b2a1adca0edfece81904aaf04608610e35ea1
diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index 73156ad..350aa64 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -14,4 +14,4 @@
# limitations under the License.
name: xos-core
-version: 2.0.0
+version: 2.1.0-dev
diff --git a/xos-core/requirements.yaml b/xos-core/requirements.yaml
index 62de4ca..2d165b1 100644
--- a/xos-core/requirements.yaml
+++ b/xos-core/requirements.yaml
@@ -18,7 +18,7 @@
version: 0.1.0-dev0
repository: file://../xos-db
- name: xos-gui
- version: 1.0.1
+ version: 1.1.0-dev
repository: file://../xos-gui
condition: xos-gui.enabled
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 98b372f..8ce3e28 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -20,10 +20,10 @@
# Docker images
# YAML variable names can't contain `-`, so substituted with `_`
-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'
+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'
nodeImage: 'node:7.9.0'
redisImage: 'redis:3.2'
diff --git a/xos-gui/Chart.yaml b/xos-gui/Chart.yaml
index bac88e8..a1efce3 100644
--- a/xos-gui/Chart.yaml
+++ b/xos-gui/Chart.yaml
@@ -15,5 +15,5 @@
name: xos-gui
description: Web GUI for XOS
-version: 1.0.1
+version: 1.1.0-dev
diff --git a/xos-gui/values.yaml b/xos-gui/values.yaml
index ffbf443..2abde74 100644
--- a/xos-gui/values.yaml
+++ b/xos-gui/values.yaml
@@ -16,7 +16,7 @@
imagePullPolicy: 'Always'
# Docker Images
-xos_guiImage: 'xosproject/xos-gui:{{ .Chart.Version }}'
+xos_guiImage: 'xosproject/xos-gui:master'
xos_wsImage: 'xosproject/xos-ws:1.0.0'
# NodePorts