Merge pull request #40 from permitio/raz/per-5022-make-image-version-…

…dynamic

remove imageRegistry value and added image object

.github/workflows/master.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
   ci_job:
     name: Continous integration
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: azure/setup-helm@v1

.github/workflows/release.yaml

@@ -6,7 +6,7 @@ on:
 jobs:
   build_chart_job:
     name: Build Helm chart
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     outputs:
       opalVersion: ${{ steps.opalVersion.outputs.opalVersion }}
     steps:
@@ -49,7 +49,7 @@ jobs:
 
   publish_chart_job:
     name: Publish Helm chart
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: build_chart_job
     steps:
       - name: checkout gh-pages

templates/_utils.tpl

@@ -22,6 +22,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "opal.serverImage" -}}
+{{- printf "%s/permitio/opal-server" .Values.image.registry }}:{{  default .Chart.AppVersion .Values.image.tag }}
+{{- end -}}
+
+{{- define "opal.clientImage" -}}
+{{- printf "%s/permitio/opal-client" (default .Values.image.registry)  }}:{{  default .Chart.AppVersion .Values.image.tag }}
+{{- end -}}
+
 {{- define "opal.envSecretsName" -}}
 {{- if eq .Release.Name .Chart.Name }}
 {{- printf "%s-env-secrets" .Release.Name  }}

templates/deployment-client.yaml

@@ -30,7 +30,7 @@ spec:
       {{- end }}
       containers:
         - name: opal-client
-          image: {{ printf "%s/permitio/opal-client:%s" .Values.imageRegistry .Chart.AppVersion | quote }}
+          image: {{ include "opal.clientImage" . | quote }}
           imagePullPolicy: IfNotPresent
           ports:
             - name: http

templates/deployment-server.yaml

@@ -32,7 +32,7 @@ spec:
 
       initContainers:
         - name: git-init
-          image: {{ printf "%s/permitio/opal-server:%s" .Values.imageRegistry .Chart.AppVersion | quote }}
+          image: {{ include "opal.serverImage" . | quote }}
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - mountPath: /opt/e2e
@@ -61,7 +61,7 @@ spec:
       {{- end }}
       containers:
         - name: opal-server
-          image: {{ printf "%s/permitio/opal-server:%s" .Values.imageRegistry .Chart.AppVersion | quote }}
+          image: {{ include "opal.serverImage" . | quote }}
           imagePullPolicy: IfNotPresent
           {{- if .Values.e2e }}
           volumeMounts:

values.schema.json

@@ -27,10 +27,18 @@
     }
   },
 
-  "type": "object", "required": ["imageRegistry"],
+  "type": "object", "required": ["image"],
 
   "properties": {
-    "imageRegistry": { "type": "string", "default": "docker.io", "title": "docker registry for all images of the chart" },
+    "image": {
+      "type": "object", "title": "image", "additionalProperties": false,
+      "required": ["registry"],
+      "properties": {
+        "registry": { "type": "string", "default": "docker.io", "title": "docker image registry" },
+        "tag": { "type": "string", "title": "docker image tag" },
+        "pullPolicy": { "type": "string", "default": "IfNotPresent", "title": "docker image pull policy" }
+      }
+    },
     "postgresImageRegistry": { "type": "string", "default": "docker.io", "title": "docker registry for postgres image of the chart" },
     "server": {
       "type": ["null", "object"], "additionalProperties": false, "title": "opal server settings",

values.yaml

@@ -1,4 +1,6 @@
-imageRegistry: docker.io
+image:
+  registry: docker.io
+
 postgresImageRegistry: docker.io
 imagePullSecrets: [ ]