fix: Double custom registry in pod image

charts/kof-child/templates/child-multi-cluster-service.yaml

@@ -1,7 +1,6 @@
 {{- $global := .Values.global | default dict }}
 {{- $globalValues := .Values.globalValues | fromYaml }}
 {{- $customRegistry := or $global.registry $globalValues.registry "" }}
-{{- if eq $customRegistry "docker.io" }}{{ $customRegistry = "" }}{{ end }}
 
 {{- range $istio := $.Values.istio.enabled | ternary (list true false) (list false) }}
 ---

charts/kof-collectors/templates/opentelemetry/instrumentation.yaml

@@ -16,7 +16,7 @@ spec:
     argument: "1"
   go:
     image: "
-      {{- if and $global.registry (ne $global.registry "docker.io") }}{{ $global.registry }}
+      {{- with $global.registry }}{{ . }}
       {{- else }}ghcr.io/open-telemetry
       {{- end }}/opentelemetry-go-instrumentation/autoinstrumentation-go:v0.21.0"
     resourceRequirements:

charts/kof-mothership/README.md

@@ -56,7 +56,7 @@ KOF Helm chart for KOF Management cluster
 | global<br>.clusterName | string | `"mothership"` | Value of clusterName usually identical to cluster used in some subcharts (e.g. otel) |
 | global<br>.random_password_length | int | `12` | Length of the auto-generated passwords for Grafana (if enabled) and VictoriaMetrics. |
 | global<br>.random_username_length | int | `8` | Length of the auto-generated usernames for Grafana (if enabled) and VictoriaMetrics. |
-| global<br>.registry | string | `"docker.io"` | Custom image registry, `sveltos-dashboard` requires not empty value. |
+| global<br>.registry | string | `""` | Custom image registry. |
 | global<br>.storageClass | string | `""` | Name of the storage class used by Grafana (if enabled), `vmstorage` (long-term storage of raw time series data), and `vmselect` (cache of query results). Keep it unset or empty to leverage the advantages of [default storage class](https://kubernetes.io/docs/concepts/storage/storage-classes/#default-storageclass). |
 | grafana<br>.enabled | bool | `false` | Enables Grafana. |
 | grafana<br>.gateway<br>.enabled | bool | `false` | Use gateway to access Grafana without port-forwarding. |

charts/kof-mothership/templates/acl/deployment.yaml

@@ -67,7 +67,7 @@ spec:
         - "--development-mode=true"
         {{- end }}
         image: "
-          {{- if and $global.registry (ne $global.registry "docker.io") }}{{ $global.registry }}
+          {{- with $global.registry }}{{ . }}
           {{- else }}{{ .Values.kcm.kof.acl.image.registry }}
           {{- end }}/{{ .Values.kcm.kof.acl.image.repository }}:
           {{- with .Values.kcm.kof.acl.image.tag }}{{ . }}

charts/kof-mothership/templates/kof-operator/operator-deployment.yaml

@@ -72,7 +72,7 @@ spec:
           - name: "RELEASE_NAME"
             value: {{ .Release.Name }}
         image: "
-          {{- if and $global.registry (ne $global.registry "docker.io") }}{{ $global.registry }}
+          {{- with $global.registry }}{{ . }}
           {{- else }}{{ .Values.kcm.kof.operator.image.registry }}
           {{- end }}/{{ .Values.kcm.kof.operator.image.repository }}:
           {{- with .Values.kcm.kof.operator.image.tag }}{{ . }}

charts/kof-mothership/templates/promxy/promxy-deployment.yaml

@@ -67,7 +67,7 @@ spec:
         command:
         - "/bin/promxy"
         image: "
-          {{- if and $global.registry (ne $global.registry "docker.io") }}{{ $global.registry }}
+          {{- with $global.registry }}{{ . }}
           {{- else }}{{ .Values.promxy.image.registry }}
           {{- end }}/{{ .Values.promxy.image.repository }}:{{ .Values.promxy.image.tag | default .Chart.Version }}"
         imagePullPolicy: {{ .Values.promxy.image.pullPolicy }}

charts/kof-mothership/templates/victoria/vmcluster.yaml

@@ -8,11 +8,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   {{- $spec := deepCopy .Values.victoriametrics.vmcluster.spec }}
-  {{- if $global.registry }}
-  {{- $_ := set $spec.vminsert.image "repository" ( printf "%s/victoriametrics/vminsert" $global.registry) }}
-  {{- $_ := set $spec.vmselect.image "repository" ( printf "%s/victoriametrics/vmselect" $global.registry) }}
-  {{- $_ := set $spec.vmstorage.image "repository" ( printf "%s/victoriametrics/vmstorage" $global.registry) }}
-  {{- end }}
   {{- if $global.storageClass }}
   {{- $_ := set $spec.vmselect.storage.volumeClaimTemplate.spec "storageClassName" $global.storageClass }}
   {{- $_ := set $spec.vmstorage.storage.volumeClaimTemplate.spec "storageClassName" $global.storageClass }}

charts/kof-mothership/values.yaml

@@ -16,8 +16,8 @@ global:
   # -- Length of the auto-generated passwords for Grafana (if enabled) and VictoriaMetrics.
   random_password_length: 12
 
-  # -- Custom image registry, `sveltos-dashboard` requires not empty value.
-  registry: docker.io
+  # -- Custom image registry.
+  registry: ""
 
 
 cert-manager:

charts/kof-regional/templates/regional-multi-cluster-service.yaml

@@ -1,7 +1,6 @@
 {{- $global := .Values.global | default dict }}
 {{- $globalValues := .Values.globalValues | fromYaml }}
 {{- $customRegistry := or $global.registry $globalValues.registry "" }}
-{{- if eq $customRegistry "docker.io" }}{{ $customRegistry = "" }}{{ end }}
 
 {{- range $istio := $.Values.istio.enabled | ternary (list true false) (list false) }}
 {{- $gatewayEnabled := and (not $istio) (index $.Values "envoy-gateway" "enabled") }}

charts/kof-storage/templates/victoria/vmauth.yaml

@@ -21,9 +21,6 @@ spec:
   {{- if not (index $spec.extraArgs "reloadAuthKey") }}
   {{- $_ := set $spec.extraArgs "reloadAuthKey" (randAlphaNum 32) }}
   {{- end }}
-  {{- if $global.registry }}
-  {{- $_ := set $spec.image "repository" ( printf "%s/victoriametrics/vmauth" $global.registry) }}
-  {{- end }}
   {{- if hasKey $spec "ingress" }}
   {{- if $spec.ingress.enabled }}
     {{- if not (get $spec.ingress.annotations "cert-manager.io/cluster-issuer") }}

charts/kof-storage/templates/victoria/vmcluster.yaml

@@ -8,11 +8,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   {{- $spec := deepCopy .Values.victoriametrics.vmcluster.spec }}
-  {{- if $global.image.registry }}
-  {{- $_ := set $spec.vminsert.image "repository" ( printf "%s/victoriametrics/vminsert" $global.image.registry) }}
-  {{- $_ := set $spec.vmselect.image "repository" ( printf "%s/victoriametrics/vmselect" $global.image.registry) }}
-  {{- $_ := set $spec.vmstorage.image "repository" ( printf "%s/victoriametrics/vmstorage" $global.image.registry) }}
-  {{- end }}
   {{- if $global.storageClass }}
   {{- $_ := set $spec.vmselect.storage.volumeClaimTemplate.spec "storageClassName" $global.storageClass }}
   {{- $_ := set $spec.vmstorage.storage.volumeClaimTemplate.spec "storageClassName" $global.storageClass }}