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-profiles/base-kubernetes/Chart.yaml b/xos-profiles/base-kubernetes/Chart.yaml
index e404344..71e6297 100644
--- a/xos-profiles/base-kubernetes/Chart.yaml
+++ b/xos-profiles/base-kubernetes/Chart.yaml
@@ -14,11 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: base-kubernetes
+apiVersion: v1
+appVersion: "1.0"
description: A Helm chart for XOS's "base-kubernetes" profile
-icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.0
-
-# xosproject/tosca-loader version
-appVersion: 1.1.0
-
+name: base-kubernetes
+version: 0.1.0
diff --git a/xos-profiles/base-kubernetes/requirements.yaml b/xos-profiles/base-kubernetes/requirements.yaml
index ff2de09..6d0ea7e 100644
--- a/xos-profiles/base-kubernetes/requirements.yaml
+++ b/xos-profiles/base-kubernetes/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: kubernetes
- version: 1.0.4
+ version: 1.0.1-dev
repository: file://../../xos-services/kubernetes
diff --git a/xos-profiles/base-kubernetes/templates/tosca-job.yaml b/xos-profiles/base-kubernetes/templates/tosca-job.yaml
index 4578761..9502ecc 100644
--- a/xos-profiles/base-kubernetes/templates/tosca-job.yaml
+++ b/xos-profiles/base-kubernetes/templates/tosca-job.yaml
@@ -36,8 +36,8 @@
restartPolicy: OnFailure
containers:
- name: {{ .Chart.Name }}-tosca-loader
- image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ tpl .Values.tosca_loaderImage . | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: XOS_USER
value: {{ .Values.xosAdminUser }}
diff --git a/xos-profiles/base-kubernetes/values.yaml b/xos-profiles/base-kubernetes/values.yaml
index ac6cb1c..8521140 100644
--- a/xos-profiles/base-kubernetes/values.yaml
+++ b/xos-profiles/base-kubernetes/values.yaml
@@ -22,14 +22,9 @@
nameOverride: ""
fullnameOverride: ""
-# tosca loader container
-image:
- repository: 'xosproject/tosca-loader'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
+imagePullPolicy: 'IfNotPresent'
-global:
- registry: ""
+tosca_loaderImage: "xosproject/tosca-loader:1.0.1"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"