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-db/Chart.yaml b/xos-db/Chart.yaml
index e66aac5..677cbc9 100644
--- a/xos-db/Chart.yaml
+++ b/xos-db/Chart.yaml
@@ -14,9 +14,4 @@
# limitations under the License.
name: xos-db
-version: 1.0.0
-
-icon: https://www.postgresql.org/media/img/about/press/elephant.png
-
-# Postgres container from: https://hub.docker.com/_/postgres/
-appVersion: '10.3-alpine'
+version: 0.1.0-dev0
diff --git a/xos-db/templates/db-deployment.yaml b/xos-db/templates/db-deployment.yaml
index d467b05..a3d3e91 100644
--- a/xos-db/templates/db-deployment.yaml
+++ b/xos-db/templates/db-deployment.yaml
@@ -28,8 +28,8 @@
spec:
containers:
- name: xos-db
- image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
- imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ .Values.postgresImage | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
ports:
- containerPort: 5432
protocol: TCP
diff --git a/xos-db/values.yaml b/xos-db/values.yaml
index 8428769..8bb026d 100644
--- a/xos-db/values.yaml
+++ b/xos-db/values.yaml
@@ -15,13 +15,8 @@
# XOS Postgres database related values
-image:
- repository: 'postgres'
- tag: '{{ .Chart.AppVersion }}'
- pullPolicy: 'Always'
-
-global:
- registry: ""
+imagePullPolicy: 'Always'
+postgresImage: 'postgres:10.3-alpine'
# Database name/username/password
xosDBName: 'xos'