diff --git a/apis/installer/v1alpha1/kubevault_catalog_types.go b/apis/installer/v1alpha1/kubevault_catalog_types.go
index 37b63aee..021b5fc1 100644
--- 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
index ffc3720a..f754eaf7 100644
--- 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
index 8ce2ef49..c11c3479 100644
--- 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
index 059512d2..9acce628 100644
--- 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
index d651818d..92a38ab0 100644
--- 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
index 8ac6b952..7ab877e5 100644
--- 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
index bbd63e2c..705349ce 100644
--- 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
index 270677b5..5a58c509 100644
--- 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
index 117060ad..b1e824d1 100644
--- 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
index 9742c880..8df51af1 100644
--- 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
index 4cd35912..77b4366d 100644
--- 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
index efccb9fe..590e6a49 100644
--- 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
index 08111af0..27590be5 100644
--- 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
index bb31fe62..24ffbb28 100644
--- 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
index d888e73f..b2869db7 100644
--- 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
index 717f102a..044575aa 100644
--- 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 | "" |
-| fullnameOverride | Overrides fullname template | "" |
-| registryFQDN | Docker registry fqdn used to pull KubeDB related images Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" |
-| proxies.dockerHub | | "" |
-| proxies.dockerLibrary | | "" |
-| proxies.ghcr | | ghcr.io |
-| proxies.kubernetes | | registry.k8s.io |
-| proxies.appscode | | r.appscode.com |
-| skipDeprecated | Set true to avoid deploying deprecated versions | true |
+| Parameter | Description | Default |
+|-----------------------|-------------------------------------------------|------------------------------|
+| nameOverride | Overrides name template | "" |
+| fullnameOverride | Overrides fullname template | "" |
+| proxies.dockerHub | | "" |
+| proxies.dockerLibrary | | "" |
+| proxies.ghcr | | ghcr.io |
+| proxies.kubernetes | | registry.k8s.io |
+| proxies.appscode | | r.appscode.com |
+| skipDeprecated | Set true to avoid deploying deprecated versions | true |
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
index c53233ff..eb21aab3 100644
--- 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
index abac22c2..1da767e3 100644
--- 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
index 756fceaf..a0ccdd9a 100644
--- 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
index 4dface71..21ad00f0 100644
--- 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
index b11b4beb..54715cb0 100644
--- 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
index 709e4eea..e0425072 100644
--- 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
index 8f9f3a8a..ba3fc20e 100644
--- 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
index cf0f9084..0a85c4b3 100644
--- 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
index 62a0d512..e50fa1b6 100644
--- 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
index 6f332681..aa865fd5 100644
--- 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
index a69329cd..1064d6cd 100644
--- 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
index f3eeccc5..60aba92e 100644
--- 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
index 08372b40..4122694f 100644
--- 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
index fe26aa40..4328925b 100644
--- 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
index 3bcaccba..1ac961e2 100644
--- 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
index d1ac54fe..15c32b76 100644
--- 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
index 16709990..7e0e25c1 100644
--- 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
index 34eddd5e..cd6a870d 100644
--- 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
index 173a2216..77ae866f 100644
--- 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
index 4b99de37..1ca591df 100644
--- 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 }}
diff --git a/charts/kubevault/values.openapiv3_schema.yaml b/charts/kubevault/values.openapiv3_schema.yaml
index f6a13bb9..57778eb4 100644
--- a/charts/kubevault/values.openapiv3_schema.yaml
+++ b/charts/kubevault/values.openapiv3_schema.yaml
@@ -73,8 +73,6 @@ properties:
description: registry.k8s.io
type: string
type: object
- registryFQDN:
- type: string
skipDeprecated:
type: boolean
required: