XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy
Change-Id: I7f3457882830de050d1357254fc5483faf91d03f
diff --git a/sadis-server/Chart.yaml b/sadis-server/Chart.yaml
index 985e029..ea3f0e1 100644
--- a/sadis-server/Chart.yaml
+++ b/sadis-server/Chart.yaml
@@ -13,4 +13,5 @@
# limitations under the License.
name: sadis-server
-version: 1.0.0-dev
+version: 1.0.1
+appVersion: latest
diff --git a/sadis-server/templates/sadis-deployment.yaml b/sadis-server/templates/sadis-deployment.yaml
index 9e2c882..36a14f9 100644
--- a/sadis-server/templates/sadis-deployment.yaml
+++ b/sadis-server/templates/sadis-deployment.yaml
@@ -29,8 +29,8 @@
spec:
containers:
- name: sadis-server
- image: {{ .Values.image }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
+ image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- containerPort: 8000
port: 8000
diff --git a/sadis-server/values.yaml b/sadis-server/values.yaml
index f65a8bc..7c3cea9 100644
--- a/sadis-server/values.yaml
+++ b/sadis-server/values.yaml
@@ -12,8 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-image: "opencord/sadis-server:latest"
-imagePullPolicy: Always
+
+image:
+ repository: 'opencord/sadis-server'
+ tag: '{{ .Chart.AppVersion }}'
+ pullPolicy: 'Always'
+
+global:
+ registry: ''
xosAdminUser: "admin@opencord.org"
-xosAdminPassword: "letmein"
\ No newline at end of file
+xosAdminPassword: "letmein"