From db03e0154b840280535abc44bb5b5502a94b7d17 Mon Sep 17 00:00:00 2001 From: sido Date: Thu, 6 Sep 2018 08:04:27 +0200 Subject: [PATCH] reverted registry to comply to values.yml --- molgenis-preview/questions.yml | 2 +- molgenis-preview/templates/deployment.yaml | 2 +- molgenis-preview/values.yaml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/molgenis-preview/questions.yml b/molgenis-preview/questions.yml index a70dcc1..f200b2d 100644 --- a/molgenis-preview/questions.yml +++ b/molgenis-preview/questions.yml @@ -9,7 +9,7 @@ questions: required: true group: "Services and Load Balancing" label: Hostname -- variable: molgenis.image.registry +- variable: molgenis.image.repository default: "registry.hub.docker.com" description: "Select a registry to pull from" type: enum diff --git a/molgenis-preview/templates/deployment.yaml b/molgenis-preview/templates/deployment.yaml index 8b638b8..cd6cf2f 100644 --- a/molgenis-preview/templates/deployment.yaml +++ b/molgenis-preview/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: containers: - name: molgenis {{- with .Values.molgenis }} - image: "{{ .image.repository }}:{{ .image.tag }}" + image: "{{ .image.registry }}/{{ .image.name }}:{{ .image.tag }}" imagePullPolicy: {{ .image.pullPolicy }} env: - name: molgenis.home diff --git a/molgenis-preview/values.yaml b/molgenis-preview/values.yaml index 6fdefd5..4ec9059 100644 --- a/molgenis-preview/values.yaml +++ b/molgenis-preview/values.yaml @@ -17,7 +17,8 @@ ingress: molgenis: image: - registry: registry.molgenis.org/molgenis/molgenis-app + repository: registry.molgenis.org + name: molgenis/molgenis-app tag: 7.0.0-SNAPSHOT pullPolicy: Always adminPassword: admin