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-core/Chart.yaml b/xos-core/Chart.yaml
index d47d9c1..350aa64 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -14,12 +14,4 @@
# limitations under the License.
name: xos-core
-description: XOS - An Extensible Cloud Operating System
-icon: https://guide.opencord.org/logos/xos.svg
-
-version: 2.1.15
-
-# appVersion is of the xos-core and xos-chameleon containers.
-# xos-tosca and xos-api-tester are versioned in values.yaml
-appVersion: 2.1.15
-
+version: 2.1.0-dev
diff --git a/xos-core/requirements.yaml b/xos-core/requirements.yaml
index de38084..2d165b1 100644
--- a/xos-core/requirements.yaml
+++ b/xos-core/requirements.yaml
@@ -15,10 +15,10 @@
dependencies:
- name: xos-db
- version: 1.0.0
+ version: 0.1.0-dev0
repository: file://../xos-db
- name: xos-gui
- version: 1.2.0
+ version: 1.1.0-dev
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 41f1f6e..d61cdd9 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -28,8 +28,8 @@
spec:
containers:
- name: xos-chameleon
- image: {{ .Values.global.registry }}{{ .Values.images.xos_chameleon.repository }}:{{ tpl .Values.images.xos_chameleon.tag . }}
- imagePullPolicy: {{ .Values.images.xos_chameleon.pullPolicy }}
+ 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:
- containerPort: 9101
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index a785392..54b2a5a 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.yaml
@@ -28,8 +28,8 @@
spec:
containers:
- name: xos-core
- image: {{ .Values.global.registry }}{{ .Values.images.xos_core.repository }}:{{ tpl .Values.images.xos_core.tag . }}
- imagePullPolicy: {{ .Values.images.xos_core.pullPolicy }}
+ image: {{ tpl .Values.xos_coreImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
command: ["/bin/bash", "-c", "cd coreapi; ./start_coreapi.sh"]
ports:
- containerPort: 50051
diff --git a/xos-core/templates/tests/test-xos-core-api.yaml b/xos-core/templates/tests/test-xos-core-api.yaml
index 1162de0..7899b00 100644
--- a/xos-core/templates/tests/test-xos-core-api.yaml
+++ b/xos-core/templates/tests/test-xos-core-api.yaml
@@ -25,8 +25,8 @@
restartPolicy: Never
containers:
- name: {{ .Release.Name }}-api-test
- image: {{ .Values.global.registry }}{{ .Values.images.xos_api_tester.repository }}:{{ tpl .Values.images.xos_api_tester.tag . }}
- imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
+ image: {{ .Values.xos_api_testerImage }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
volumeMounts:
- name: log-volume
mountPath: /src/cord-api/Tests/Log/
diff --git a/xos-core/templates/tosca-deployment.yaml b/xos-core/templates/tosca-deployment.yaml
index c6f8376..48eecf2 100644
--- a/xos-core/templates/tosca-deployment.yaml
+++ b/xos-core/templates/tosca-deployment.yaml
@@ -28,8 +28,8 @@
spec:
containers:
- name: xos-tosca
- image: {{ .Values.global.registry }}{{ .Values.images.xos_tosca.repository }}:{{ tpl .Values.images.xos_tosca.tag . }}
- imagePullPolicy: {{ .Values.images.xos_tosca.pullPolicy }}
+ image: {{ .Values.xos_toscaImage | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
ports:
- containerPort: 9102
port: 9102
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 688f379..7f315bc 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -16,31 +16,14 @@
xos_gui:
enabled: true
+imagePullPolicy: 'Always'
+
# Docker images
# YAML variable names can't contain `-`, so substituted with `_`
-images:
- xos_core:
- repository: 'xosproject/xos-core'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
-
- xos_chameleon:
- repository: 'xosproject/chameleon'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
-
- xos_tosca:
- repository: 'xosproject/xos-tosca'
- tag: '1.1.1'
- pullPolicy: 'Always'
-
- xos_api_tester:
- repository: 'xosproject/xos-api-tester'
- tag: '2.0.3'
- pullPolicy: 'Always'
-
-global:
- registry: ""
+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'
# NodePorts
xos_chameleonNodePort: 30006