GDB-7983: Use Chart.AppVersion by default

Templates will now use `Chart.AppVersion` by default
unless `images.graphdb.tag` is specified

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 - Updated the default ingress's path type to `ImplementationSpecific`
 - Updated graphdb.properties example file
+- Templates will now use `Chart.AppVersion` by default unless `images.graphdb.tag` is specified.
 
 ## Version 10.5.1-R2
 

templates/_helpers.yaml

@@ -38,18 +38,18 @@ Otherwise it is left blank and cluster default will be used.
 {{- end }}
 
 {{/*
-Renders full name of the graphdb pod
+Render the container image for GraphDB
 */}}
-{{- define "graphdb.renderFullImageName" -}}
-  {{- $fullImageName := .image.repository -}}
-
-  {{- if or .globalRegistry .image.registry -}}
-    {{- $fullImageName = printf "%s/%s" ( .image.registry | default .globalRegistry) .image.repository -}}
+{{- define "graphdb.image" -}}
+  {{- $registry := .Values.images.graphdb.registry -}}
+  {{- $repository := .Values.images.graphdb.repository -}}
+  {{- $tag := .Values.images.graphdb.tag | default .Chart.AppVersion | toString -}}
+  {{- if and .Values.global .Values.global.imageRegistry -}}
+    {{- $registry = .Values.global.imageRegistry -}}
   {{- end -}}
-
-  {{- if .image.tag -}}
-    {{- printf "%s:%s" $fullImageName .image.tag -}}
+  {{- if $registry -}}
+    {{- printf "%s/%s:%s" $registry $repository $tag -}}
   {{- else -}}
-    {{- print $fullImageName -}}
+    {{- printf "%s:%s" $repository $tag -}}
   {{- end -}}
-{{- end -}}
+{{- end }}

templates/graphdb-cluster-proxy.yaml

@@ -64,7 +64,7 @@ spec:
         {{- include "graphdb.combinedImagePullSecrets" $ | nindent 8 }}
       containers:
         - name: graphdb-proxy
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.graphdb) }}
+          image: {{ include "graphdb.image" . }}
           imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }}
           command: ["/opt/graphdb/dist/bin/cluster-proxy"]
           envFrom:

templates/graphdb-node.yaml

@@ -95,7 +95,7 @@ spec:
         {{- include "graphdb.combinedImagePullSecrets" $ | nindent 8 }}
       containers:
         - name: graphdb-node
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.graphdb) }}
+          image: {{ include "graphdb.image" . }}
           imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }}
           {{- with .Values.graphdb.node.command }}
           command: {{ toYaml . | nindent 12 }}
@@ -154,7 +154,7 @@ spec:
       initContainers:
         # PROVISION SETTINGS AND SECURITY
         - name: provision-settings
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.busybox) }}
+          image: {{ include "graphdb.image" . }}
           imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }}
           volumeMounts:
             {{- if hasKey $.Values.graphdb.node.persistence "volumeClaimTemplateSpec" }}

templates/jobs/patch-cluster-job.yaml

@@ -21,7 +21,7 @@ spec:
         {{- $.Values.graphdb.jobPodSecurityContext | toYaml | nindent 8 }}
       containers:
         - name: patch-cluster
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.graphdb) }}
+          image: {{ include "graphdb.image" . }}
           envFrom:
             - secretRef:
                 name: graphdb-provision-user

templates/jobs/post-start-job.yaml

@@ -21,7 +21,7 @@ spec:
         {{- $.Values.graphdb.jobPodSecurityContext | toYaml | nindent 8 }}
       containers:
         - name: create-graphdb-cluster
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.graphdb) }}
+          image: {{ include "graphdb.image" . }}
           envFrom:
             - secretRef:
                 name: graphdb-provision-user

templates/jobs/provision-repositories-job.yaml

@@ -22,7 +22,7 @@ spec:
         {{- $.Values.graphdb.jobPodSecurityContext | toYaml | nindent 8 }}
       containers:
         - name: provision-repositories
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.graphdb) }}
+          image: {{ include "graphdb.image" . }}
           envFrom:
             - secretRef:
                 name: graphdb-provision-user

templates/jobs/scale-down-cluster-job.yaml

@@ -19,7 +19,7 @@ spec:
         {{- $.Values.graphdb.jobPodSecurityContext | toYaml | nindent 8 }}
       containers:
         - name: scale-down-cluster
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.graphdb) }}
+          image: {{ include "graphdb.image" . }}
           envFrom:
             - secretRef:
                 name: graphdb-provision-user

templates/jobs/scale-up-cluster-job.yaml

@@ -21,7 +21,7 @@ spec:
         {{- $.Values.graphdb.jobPodSecurityContext | toYaml | nindent 8 }}
       containers:
         - name: scale-up-cluster
-          image: {{ include "graphdb.renderFullImageName" (dict "globalRegistry" $.Values.global.imageRegistry "image" $.Values.images.graphdb) }}
+          image: {{ include "graphdb.image" . }}
           envFrom:
             - secretRef:
                 name: graphdb-provision-user

values.yaml

@@ -13,8 +13,10 @@ global:
 # Top lvl flat for easier maintenance
 images:
   graphdb:
+    registry: docker.io
     repository: ontotext/graphdb
-    tag: "10.5.1"
+    # If specified, overrides Chart.AppVersion
+    tag: ""
   busybox:
     repository: busybox
     tag: "1.31"