added logic to define the image type as public or private

Author: briiians

varnish-enterprise/templates/_helpers.tpl

@@ -35,12 +35,31 @@ Create chart name and version as used by the chart label.
 {{/*
 Sets up the Varnish Enterprise image and its overrides (if any)
 */}}
-{{- define "varnish-enterprise.image" }}
-{{- $base := .base | default dict }}
-{{- $image := .image | default dict }}
-image: "{{- if eq $image.repository "-" -}}{{ $base.repository }}{{ else }}{{ $image.repository }}{{ end }}:{{- if eq $image.tag "-" }}{{ default .Chart.AppVersion $base.tag }}{{ else }}{{ default $.Chart.AppVersion $image.tag }}{{ end }}"
+{{- define "varnish-enterprise.image" -}}
+{{- $base := .base | default dict -}}
+{{- $image := .image | default dict -}}
+
+{{- $repoType := .Values.global.repoType | default "" -}}
+{{- $calculatedRepo := $base.repository -}}
+
+{{- if eq $repoType "public-enterprise" }}
+  {{- $calculatedRepo = "varnish/enterprise" }}
+{{- else if eq $repoType "private-enterprise" }}
+  {{- $calculatedRepo = "quay.io/varnish-software/varnish-plus" }}
+{{ end }}
+image: "{{- if eq $image.repository "-" -}}
+          {{ $calculatedRepo }}
+        {{- else -}}
+          {{ $image.repository }} y
+        {{- end -}}
+        :
+        {{- if eq $image.tag "-" }}
+          {{ default .Chart.AppVersion $base.tag }}
+        {{- else -}}
+          {{ default $.Chart.AppVersion $image.tag }}
+        {{- end -}}"
 imagePullPolicy: {{ if eq $image.pullPolicy "-" }}{{ $base.pullPolicy }}{{ else }}{{ $image.pullPolicy }}{{ end }}
-{{- end }}
+{{- end -}}
 
 {{/*
 Converts size string (e.g. 10Mi or 10M) to a number

varnish-enterprise/values.yaml

@@ -70,6 +70,9 @@ global:
       # Configures the NATS internal cluster domain name. Only change if NATS is deployed
       # on a separate cluster.
       clusterDomain: "cluster.local"
+  
+  # Sets the option of a different repo than the quay.io image
+  repoType: "private-enterprise"
 
 serviceAccount:
   # Specifies whether a service account should be created
@@ -544,7 +547,7 @@ server:
   # Sets the image and tag to use to deploy Varnish Enterprise.
   # If tag is blank, appVersion is used.
   image:
-    repository: "quay.io/varnish-software/varnish-plus"
+    repository: "-"
     pullPolicy: IfNotPresent
     tag: ""
 
@@ -909,6 +912,9 @@ server:
   agent:
     enabled: false
 
+    # Sets the option of a different repo than the quay.io image below.
+    # repoType: "private-enterprise"
+
     # Sets the image and tag to use to deploy Varnish Controller Agent sidecar. The image
     # should be the same version as varnish-controller.
     image: