diff --git a/apis/installer/v1alpha1/kubedb_catalog_types.go b/apis/installer/v1alpha1/kubedb_catalog_types.go index c0816eeb7..fcc301697 100644 --- a/apis/installer/v1alpha1/kubedb_catalog_types.go +++ b/apis/installer/v1alpha1/kubedb_catalog_types.go @@ -45,8 +45,6 @@ type KubedbCatalogSpec struct { //+optional FullnameOverride string `json:"fullnameOverride"` //+optional - RegistryFQDN string `json:"registryFQDN"` - //+optional Proxies RegistryProxies `json:"proxies"` Catalog Catalog `json:"catalog"` Psp PSP `json:"psp"` diff --git a/charts/kubedb-catalog/README.md b/charts/kubedb-catalog/README.md index 279e6f5a7..d833f9bb3 100644 --- a/charts/kubedb-catalog/README.md +++ b/charts/kubedb-catalog/README.md @@ -45,50 +45,49 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the `kubedb-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 | -| catalog.elasticsearch | If true, deploys Elasticsearch version catalog | true | -| catalog.etcd | If true, deploys Etcd version catalog | true | -| catalog.memcached | If true, deploys Memcached version catalog | true | -| catalog.mongodb | If true, deploys MongoDB version catalog | true | -| catalog.mysql | If true, deploys MySQL version catalog | true | -| catalog.mariadb | If true, deploys MariaDB version catalog | true | -| catalog.perconaxtradb | If true, deploys Percona XtraDB version catalog | true | -| catalog.pgbouncer | If true, deploys PgBouncer version catalog | true | -| catalog.postgres | If true, deploys PostgreSQL version catalog | true | -| catalog.proxysql | If true, deploys ProxySQL version catalog | true | -| catalog.redis | If true, deploys Redis version catalog | true | -| catalog.kafka | | true | -| psp.enabled | | true | -| psp.elasticsearch.allowPrivilegeEscalation | | true | -| psp.elasticsearch.privileged | | true | -| psp.mariadb.allowPrivilegeEscalation | | false | -| psp.mariadb.privileged | | false | -| psp.memcached.allowPrivilegeEscalation | | false | -| psp.memcached.privileged | | false | -| psp.mongodb.allowPrivilegeEscalation | | false | -| psp.mongodb.privileged | | false | -| psp.mysql.allowPrivilegeEscalation | | false | -| psp.mysql.privileged | | false | -| psp.perconaxtradb.allowPrivilegeEscalation | | false | -| psp.perconaxtradb.privileged | | false | -| psp.postgres.allowPrivilegeEscalation | | false | -| psp.postgres.privileged | | false | -| psp.proxysql.allowPrivilegeEscalation | | false | -| psp.proxysql.privileged | | false | -| psp.redis.allowPrivilegeEscalation | | false | -| psp.redis.privileged | | false | -| psp.kafka.allowPrivilegeEscalation | | false | -| psp.kafka.privileged | | false | -| 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 | +| catalog.elasticsearch | If true, deploys Elasticsearch version catalog | true | +| catalog.etcd | If true, deploys Etcd version catalog | true | +| catalog.memcached | If true, deploys Memcached version catalog | true | +| catalog.mongodb | If true, deploys MongoDB version catalog | true | +| catalog.mysql | If true, deploys MySQL version catalog | true | +| catalog.mariadb | If true, deploys MariaDB version catalog | true | +| catalog.perconaxtradb | If true, deploys Percona XtraDB version catalog | true | +| catalog.pgbouncer | If true, deploys PgBouncer version catalog | true | +| catalog.postgres | If true, deploys PostgreSQL version catalog | true | +| catalog.proxysql | If true, deploys ProxySQL version catalog | true | +| catalog.redis | If true, deploys Redis version catalog | true | +| catalog.kafka | | true | +| psp.enabled | | true | +| psp.elasticsearch.allowPrivilegeEscalation | | true | +| psp.elasticsearch.privileged | | true | +| psp.mariadb.allowPrivilegeEscalation | | false | +| psp.mariadb.privileged | | false | +| psp.memcached.allowPrivilegeEscalation | | false | +| psp.memcached.privileged | | false | +| psp.mongodb.allowPrivilegeEscalation | | false | +| psp.mongodb.privileged | | false | +| psp.mysql.allowPrivilegeEscalation | | false | +| psp.mysql.privileged | | false | +| psp.perconaxtradb.allowPrivilegeEscalation | | false | +| psp.perconaxtradb.privileged | | false | +| psp.postgres.allowPrivilegeEscalation | | false | +| psp.postgres.privileged | | false | +| psp.proxysql.allowPrivilegeEscalation | | false | +| psp.proxysql.privileged | | false | +| psp.redis.allowPrivilegeEscalation | | false | +| psp.redis.privileged | | false | +| psp.kafka.allowPrivilegeEscalation | | false | +| psp.kafka.privileged | | false | +| 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/kubedb-catalog/templates/_helpers.tpl b/charts/kubedb-catalog/templates/_helpers.tpl index 6d6f73284..65cc6e6ab 100644 --- a/charts/kubedb-catalog/templates/_helpers.tpl +++ b/charts/kubedb-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/kubedb-catalog/values.openapiv3_schema.yaml b/charts/kubedb-catalog/values.openapiv3_schema.yaml index ab2e073ad..bb673d896 100644 --- a/charts/kubedb-catalog/values.openapiv3_schema.yaml +++ b/charts/kubedb-catalog/values.openapiv3_schema.yaml @@ -156,8 +156,6 @@ properties: - enabled - kafka type: object - registryFQDN: - type: string skipDeprecated: type: boolean required: diff --git a/charts/kubedb-catalog/values.yaml b/charts/kubedb-catalog/values.yaml index 122976c37..095ff14db 100644 --- a/charts/kubedb-catalog/values.yaml +++ b/charts/kubedb-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/kubedb/templates/_helpers.tpl b/charts/kubedb/templates/_helpers.tpl index e0440bbec..316edc6ac 100644 --- a/charts/kubedb/templates/_helpers.tpl +++ b/charts/kubedb/templates/_helpers.tpl @@ -127,26 +127,6 @@ Returns the --insecure-registries flags {{- 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 }} - {{/* Returns the enabled monitoring agent name */}} diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml index 190427d3f..57dd8d50c 100644 --- a/charts/kubedb/values.openapiv3_schema.yaml +++ b/charts/kubedb/values.openapiv3_schema.yaml @@ -1501,8 +1501,6 @@ properties: - enabled - kafka type: object - registryFQDN: - type: string skipDeprecated: type: boolean required: