Fix registry proxy templates

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubevault · Oct 31, 2023 · 1addbed · 1addbed
1 parent 036ffa3
commit 1addbed
Show file tree

Hide file tree

Showing 37 changed files with 51 additions and 82 deletions.
diff --git a/apis/installer/v1alpha1/kubevault_catalog_types.go b/apis/installer/v1alpha1/kubevault_catalog_types.go
@@ -48,8 +48,6 @@ type KubevaultCatalogSpec struct {
 	//+optional
 	FullnameOverride string `json:"fullnameOverride"`
 	//+optional
-	RegistryFQDN string `json:"registryFQDN"`
-	//+optional
 	Proxies        RegistryProxies `json:"proxies"`
 	SkipDeprecated bool            `json:"skipDeprecated"`
 }

diff --git a/catalog/raw/vaultserver/vaultserver-0.11.5.yaml b/catalog/raw/vaultserver/vaultserver-0.11.5.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:0.11.5
   version: 0.11.5
diff --git a/catalog/raw/vaultserver/vaultserver-1.10.3.yaml b/catalog/raw/vaultserver/vaultserver-1.10.3.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.10.3
   version: 1.10.3
diff --git a/catalog/raw/vaultserver/vaultserver-1.11.5.yaml b/catalog/raw/vaultserver/vaultserver-1.11.5.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.11.5
   version: 1.11.5
diff --git a/catalog/raw/vaultserver/vaultserver-1.12.1.yaml b/catalog/raw/vaultserver/vaultserver-1.12.1.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.12.1
   version: 1.12.1
diff --git a/catalog/raw/vaultserver/vaultserver-1.13.3.yaml b/catalog/raw/vaultserver/vaultserver-1.13.3.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.13.3
   version: 1.13.3
diff --git a/catalog/raw/vaultserver/vaultserver-1.2.0.yaml b/catalog/raw/vaultserver/vaultserver-1.2.0.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.2.0
   version: 1.2.0
diff --git a/catalog/raw/vaultserver/vaultserver-1.2.2.yaml b/catalog/raw/vaultserver/vaultserver-1.2.2.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.2.2
   version: 1.2.2
diff --git a/catalog/raw/vaultserver/vaultserver-1.2.3.yaml b/catalog/raw/vaultserver/vaultserver-1.2.3.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.2.3
   version: 1.2.3
diff --git a/catalog/raw/vaultserver/vaultserver-1.5.9.yaml b/catalog/raw/vaultserver/vaultserver-1.5.9.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.5.9
   version: 1.5.9
diff --git a/catalog/raw/vaultserver/vaultserver-1.6.5.yaml b/catalog/raw/vaultserver/vaultserver-1.6.5.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.6.5
   version: 1.6.5
diff --git a/catalog/raw/vaultserver/vaultserver-1.7.2.yaml b/catalog/raw/vaultserver/vaultserver-1.7.2.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.7.2
   version: 1.7.2
diff --git a/catalog/raw/vaultserver/vaultserver-1.7.3.yaml b/catalog/raw/vaultserver/vaultserver-1.7.3.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.7.3
   version: 1.7.3
diff --git a/catalog/raw/vaultserver/vaultserver-1.8.2.yaml b/catalog/raw/vaultserver/vaultserver-1.8.2.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.8.2
   version: 1.8.2
diff --git a/catalog/raw/vaultserver/vaultserver-1.9.2.yaml b/catalog/raw/vaultserver/vaultserver-1.9.2.yaml
@@ -12,7 +12,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: kubevault/vault-unsealer:v0.16.0
+    image: ghcr.io/kubevault/vault-unsealer:v0.16.0
   vault:
     image: vault:1.9.2
   version: 1.9.2
diff --git a/charts/kubevault-catalog/README.md b/charts/kubevault-catalog/README.md
@@ -45,17 +45,16 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following table lists the configurable parameters of the `kubevault-catalog` chart and their default values.
 
-|       Parameter       |                                                              Description                                                               |           Default            |
-|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------|------------------------------|
-| nameOverride          | Overrides name template                                                                                                                | <code>""</code>              |
-| fullnameOverride      | Overrides fullname template                                                                                                            | <code>""</code>              |
-| registryFQDN          | Docker registry fqdn used to pull KubeDB related images Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | <code>""</code>              |
-| proxies.dockerHub     |                                                                                                                                        | <code>""</code>              |
-| proxies.dockerLibrary |                                                                                                                                        | <code>""</code>              |
-| proxies.ghcr          |                                                                                                                                        | <code>ghcr.io</code>         |
-| proxies.kubernetes    |                                                                                                                                        | <code>registry.k8s.io</code> |
-| proxies.appscode      |                                                                                                                                        | <code>r.appscode.com</code>  |
-| skipDeprecated        | Set true to avoid deploying deprecated versions                                                                                        | <code>true</code>            |
+|       Parameter       |                   Description                   |           Default            |
+|-----------------------|-------------------------------------------------|------------------------------|
+| nameOverride          | Overrides name template                         | <code>""</code>              |
+| fullnameOverride      | Overrides fullname template                     | <code>""</code>              |
+| proxies.dockerHub     |                                                 | <code>""</code>              |
+| proxies.dockerLibrary |                                                 | <code>""</code>              |
+| proxies.ghcr          |                                                 | <code>ghcr.io</code>         |
+| proxies.kubernetes    |                                                 | <code>registry.k8s.io</code> |
+| proxies.appscode      |                                                 | <code>r.appscode.com</code>  |
+| skipDeprecated        | Set true to avoid deploying deprecated versions | <code>true</code>            |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:

diff --git a/charts/kubevault-catalog/templates/_helpers.tpl b/charts/kubevault-catalog/templates/_helpers.tpl
@@ -63,21 +63,21 @@ Create the name of the service account to use
 {{- end }}
 
 {{- define "image.dockerHub" -}}
-{{ prepend (list ._repo) (list .Values.proxies.dockerHub .Values.registryFQDN | compact | first) | compact | join "/" }}
+{{ list .Values.proxies.dockerHub ._repo | compact | join "/" }}
 {{- end }}
 
 {{- define "image.dockerLibrary" -}}
-{{ prepend (list ._repo) (list .Values.proxies.dockerLibrary .Values.proxies.dockerHub .Values.registryFQDN | compact | first) | compact | join "/" }}
+{{ prepend (list ._repo) (list .Values.proxies.dockerLibrary .Values.proxies.dockerHub | compact | first) | compact | join "/" }}
 {{- end }}
 
 {{- define "image.ghcr" -}}
-{{ prepend (list ._repo) (list .Values.proxies.ghcr .Values.registryFQDN | compact | first) | compact | join "/" }}
+{{ list .Values.proxies.ghcr ._repo | compact | join "/" }}
 {{- end }}
 
 {{- define "image.kubernetes" -}}
-{{ prepend (list ._repo) (list .Values.proxies.kubernetes .Values.registryFQDN | compact | first) | compact | join "/" }}
+{{ list .Values.proxies.kubernetes ._repo | compact | join "/" }}
 {{- end }}
 
 {{- define "image.appscode" -}}
-{{ prepend (list ._repo) (list .Values.proxies.appscode .Values.registryFQDN | compact | first) | compact | join "/" }}
+{{ list .Values.proxies.appscode ._repo | compact | join "/" }}
 {{- end }}
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-0.11.5.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-0.11.5.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:0.11.5'
   version: 0.11.5
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.10.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.10.3.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.10.3'
   version: 1.10.3
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.11.5.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.11.5.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.11.5'
   version: 1.11.5
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.12.1.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.12.1.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.12.1'
   version: 1.12.1
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.13.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.13.3.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.13.3'
   version: 1.13.3
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.0.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.0.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.2.0'
   version: 1.2.0
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.2.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.2.2'
   version: 1.2.2
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.2.3.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.2.3'
   version: 1.2.3
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.5.9.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.5.9.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.5.9'
   version: 1.5.9
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.6.5.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.6.5.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.6.5'
   version: 1.6.5
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.2.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.7.2'
   version: 1.7.2
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.3.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.7.3.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.7.3'
   version: 1.7.3
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.8.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.8.2.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.8.2'
   version: 1.8.2
diff --git a/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.9.2.yaml b/charts/kubevault-catalog/templates/vaultserver/vaultserver-1.9.2.yaml
@@ -14,7 +14,7 @@ spec:
       restoreTask:
         name: vault-restore-1.10.3
   unsealer:
-    image: '{{ include "image.dockerHub" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubevault/vault-unsealer") $) }}:v0.16.0'
   vault:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "vault") $) }}:1.9.2'
   version: 1.9.2
diff --git a/charts/kubevault-catalog/values.openapiv3_schema.yaml b/charts/kubevault-catalog/values.openapiv3_schema.yaml
@@ -21,8 +21,6 @@ properties:
         description: registry.k8s.io
         type: string
     type: object
-  registryFQDN:
-    type: string
   skipDeprecated:
     type: boolean
 required:

diff --git a/charts/kubevault-catalog/values.yaml b/charts/kubevault-catalog/values.yaml
@@ -7,10 +7,6 @@ nameOverride: ""
 # Overrides fullname template
 fullnameOverride: ""
 
-# Docker registry fqdn used to pull KubeDB related images
-# Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image}
-registryFQDN: ""
-
 proxies:
   dockerHub: ""
   dockerLibrary: ""

diff --git a/charts/kubevault-opscenter/Chart.lock b/charts/kubevault-opscenter/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: kubevault-metrics
   repository: file://../kubevault-metrics
-  version: v2023.9.7
+  version: v2023.10.26-rc.0
 - name: kubevault-grafana-dashboards
   repository: file://../kubevault-grafana-dashboards
-  version: v2023.9.7
-digest: sha256:2d56ae4291590f3535ab3a95e06b39f5a570a5c5242cbca99547266becbca544
-generated: "2023-09-07T16:17:30.850309587Z"
+  version: v2023.10.26-rc.0
+digest: sha256:5953c96d3931f5375f65d62ca8616919a59c055091bdbe5dca5422d7c9097fa9
+generated: "2023-10-30T17:08:20.991698-07:00"
diff --git a/charts/kubevault/Chart.lock b/charts/kubevault/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: kubevault-crds
   repository: file://../kubevault-crds
-  version: v2023.9.7
+  version: v2023.10.26-rc.0
 - name: kubevault-catalog
   repository: file://../kubevault-catalog
-  version: v2023.9.7
+  version: v2023.10.26-rc.0
 - name: kubevault-operator
   repository: file://../kubevault-operator
   version: v0.16.0
 - name: kubevault-webhook-server
   repository: file://../kubevault-webhook-server
   version: v0.16.0
-digest: sha256:57ae426f0a330f312adeb772769496ed4225993490cd8a7af9057a2f409dbc7b
-generated: "2023-09-07T16:17:30.674873737Z"
+digest: sha256:ef2ddb372221b2343f25840258069d3b2cb93deb170f1e2bbba0a955e06b52cc
+generated: "2023-10-30T17:08:17.348564-07:00"
diff --git a/charts/kubevault/templates/_helpers.tpl b/charts/kubevault/templates/_helpers.tpl
@@ -141,23 +141,3 @@ Returns the ServiceMonitor labels
 {{- end }}
 {{- end }}
 {{- end }}
-
-{{- define "image.dockerHub" -}}
-{{ prepend (list ._repo) (list .Values.proxies.dockerHub .Values.global.registryFQDN .Values.registryFQDN | compact | first) | compact | join "/" }}
-{{- end }}
-
-{{- define "image.dockerLibrary" -}}
-{{ prepend (list ._repo) (list .Values.proxies.dockerLibrary .Values.proxies.dockerHub .Values.global.registryFQDN .Values.registryFQDN | compact | first) | compact | join "/" }}
-{{- end }}
-
-{{- define "image.ghcr" -}}
-{{ prepend (list ._repo) (list .Values.proxies.ghcr .Values.global.registryFQDN .Values.registryFQDN | compact | first) | compact | join "/" }}
-{{- end }}
-
-{{- define "image.kubernetes" -}}
-{{ prepend (list ._repo) (list .Values.proxies.kubernetes .Values.global.registryFQDN .Values.registryFQDN | compact | first) | compact | join "/" }}
-{{- end }}
-
-{{- define "image.appscode" -}}
-{{ prepend (list ._repo) (list .Values.proxies.appscode .Values.global.registryFQDN .Values.registryFQDN | compact | first) | compact | join "/" }}
-{{- end }}