Merge branch 'added-selectable-molgenis-versions' of p281392/molgenis-ops-docker-helm into master

molgenis-preview/questions.yml

@@ -9,6 +9,28 @@ questions:
   required: true
   group: "Services and Load Balancing"
   label: Hostname
+- variable: molgenis.image.repository
+  default: "registry.hub.docker.com"
+  description: "Select a registry to pull from"
+  type: enum
+  options:
+  - "registry.hub.docker.com"
+  - "registry.molgenis.org"
+  required: true
+  group: "MOLGENIS - Version"
+  label: Registry
+- variable: molgenis.image.tag
+  default: "stable"
+  description: "Select a MOLGENIS version"
+  type: enum
+  options:
+  - "latest"
+  - "stable"
+  - "7.1-stable"
+  - "7.0-stable"
+  required: true
+  group: "MOLGENIS - Version"
+  label: Version
 - variable: molgenis.resources.limits.cpu
   default: 1
   description: "CPU limit for this MOLGENIS instance"

molgenis-preview/templates/deployment.yaml

@@ -26,7 +26,7 @@ spec:
       containers:
         - name: molgenis
         {{- with .Values.molgenis }}
-          image: "{{ .image.repository }}:{{ .image.tag }}"
+          image: "{{ .image.repository }}/{{ .image.name }}:{{ .image.tag }}"
           imagePullPolicy: {{ .image.pullPolicy }}
           env:
             - name: molgenis.home

molgenis-preview/values.yaml

@@ -17,7 +17,8 @@ ingress:
 
 molgenis:
   image:
-    repository: registry.molgenis.org/molgenis/molgenis-app
+    repository: registry.molgenis.org
+    name: molgenis/molgenis-app
     tag: 7.0.0-SNAPSHOT
     pullPolicy: Always
   adminPassword: admin