Don't install kubedb-catalog crds by default

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Jan 27, 2024 · b680760 · b680760
1 parent 1c9c709
commit b680760
Show file tree

Hide file tree

Showing 29 changed files with 50 additions and 1 deletion.
diff --git a/apis/installer/v1alpha1/kubedb_catalog_types.go b/apis/installer/v1alpha1/kubedb_catalog_types.go
@@ -48,6 +48,7 @@ type KubedbCatalogSpec struct {
 	Proxies        RegistryProxies `json:"proxies"`
 	FeatureGates   map[string]bool `json:"featureGates"`
 	Psp            PSP             `json:"psp"`
+	InstallCRDs    bool            `json:"installCRDs"`
 	SkipDeprecated bool            `json:"skipDeprecated"`
 }
 

diff --git a/catalog/kubedb/fmt/main.go b/catalog/kubedb/fmt/main.go
@@ -649,6 +649,10 @@ func main() {
 
 		{
 			// move new_templates to templates
+			err = os.Rename(filepath.Join(dir, "charts", "kubedb-catalog", "templates", "crds.yaml"), filepath.Join(dir, "charts", "kubedb-catalog", "new_templates", "crds.yaml"))
+			if err != nil {
+				panic(err)
+			}
 			err = os.Rename(filepath.Join(dir, "charts", "kubedb-catalog", "templates", "_helpers.tpl"), filepath.Join(dir, "charts", "kubedb-catalog", "new_templates", "_helpers.tpl"))
 			if err != nil {
 				panic(err)

diff --git a/charts/kubedb-catalog/README.md b/charts/kubedb-catalog/README.md
@@ -94,6 +94,7 @@ The following table lists the configurable parameters of the `kubedb-catalog` ch
 | psp.redis.privileged                       |                                                 | <code>false</code>           |
 | psp.kafka.allowPrivilegeEscalation         |                                                 | <code>false</code>           |
 | psp.kafka.privileged                       |                                                 | <code>false</code>           |
+| installCRDs                                | Set true to install CRDs                        | <code>false</code>           |
 | skipDeprecated                             | Set true to avoid deploying deprecated versions | <code>true</code>            |
 
 

diff --git a/charts/kubedb-catalog/ci/ci-values.yaml b/charts/kubedb-catalog/ci/ci-values.yaml
@@ -1,2 +1,3 @@
 # https://github.com/helm/charts/blob/master/test/README.md#providing-custom-test-values
+installCRDs: true
 skipDeprecated: false
diff --git a/...rds/catalog.kubedb.com_druidversions.yaml → ...rds/catalog.kubedb.com_druidversions.yaml b/...rds/catalog.kubedb.com_druidversions.yaml → ...rds/catalog.kubedb.com_druidversions.yaml
diff --git a/...log.kubedb.com_elasticsearchversions.yaml → ...log.kubedb.com_elasticsearchversions.yaml b/...log.kubedb.com_elasticsearchversions.yaml → ...log.kubedb.com_elasticsearchversions.yaml
diff --git a/...crds/catalog.kubedb.com_etcdversions.yaml → ...crds/catalog.kubedb.com_etcdversions.yaml b/...crds/catalog.kubedb.com_etcdversions.yaml → ...crds/catalog.kubedb.com_etcdversions.yaml
diff --git a/.../catalog.kubedb.com_ferretdbversions.yaml → .../catalog.kubedb.com_ferretdbversions.yaml b/.../catalog.kubedb.com_ferretdbversions.yaml → .../catalog.kubedb.com_ferretdbversions.yaml
diff --git a/...og.kubedb.com_kafkaconnectorversions.yaml → ...og.kubedb.com_kafkaconnectorversions.yaml b/...og.kubedb.com_kafkaconnectorversions.yaml → ...og.kubedb.com_kafkaconnectorversions.yaml
diff --git a/...rds/catalog.kubedb.com_kafkaversions.yaml → ...rds/catalog.kubedb.com_kafkaversions.yaml b/...rds/catalog.kubedb.com_kafkaversions.yaml → ...rds/catalog.kubedb.com_kafkaversions.yaml
diff --git a/...s/catalog.kubedb.com_mariadbversions.yaml → ...s/catalog.kubedb.com_mariadbversions.yaml b/...s/catalog.kubedb.com_mariadbversions.yaml → ...s/catalog.kubedb.com_mariadbversions.yaml
diff --git a/...catalog.kubedb.com_memcachedversions.yaml → ...catalog.kubedb.com_memcachedversions.yaml b/...catalog.kubedb.com_memcachedversions.yaml → ...catalog.kubedb.com_memcachedversions.yaml
diff --git a/...s/catalog.kubedb.com_mongodbversions.yaml → ...s/catalog.kubedb.com_mongodbversions.yaml b/...s/catalog.kubedb.com_mongodbversions.yaml → ...s/catalog.kubedb.com_mongodbversions.yaml
diff --git a/...rds/catalog.kubedb.com_mysqlversions.yaml → ...rds/catalog.kubedb.com_mysqlversions.yaml b/...rds/catalog.kubedb.com_mysqlversions.yaml → ...rds/catalog.kubedb.com_mysqlversions.yaml
diff --git a/...log.kubedb.com_perconaxtradbversions.yaml → ...log.kubedb.com_perconaxtradbversions.yaml b/...log.kubedb.com_perconaxtradbversions.yaml → ...log.kubedb.com_perconaxtradbversions.yaml
diff --git a/...catalog.kubedb.com_pgbouncerversions.yaml → ...catalog.kubedb.com_pgbouncerversions.yaml b/...catalog.kubedb.com_pgbouncerversions.yaml → ...catalog.kubedb.com_pgbouncerversions.yaml
diff --git a/...ds/catalog.kubedb.com_pgpoolversions.yaml → ...ds/catalog.kubedb.com_pgpoolversions.yaml b/...ds/catalog.kubedb.com_pgpoolversions.yaml → ...ds/catalog.kubedb.com_pgpoolversions.yaml
diff --git a/.../catalog.kubedb.com_postgresversions.yaml → .../catalog.kubedb.com_postgresversions.yaml b/.../catalog.kubedb.com_postgresversions.yaml → .../catalog.kubedb.com_postgresversions.yaml
diff --git a/.../catalog.kubedb.com_proxysqlversions.yaml → .../catalog.kubedb.com_proxysqlversions.yaml b/.../catalog.kubedb.com_proxysqlversions.yaml → .../catalog.kubedb.com_proxysqlversions.yaml
diff --git a/.../catalog.kubedb.com_rabbitmqversions.yaml → .../catalog.kubedb.com_rabbitmqversions.yaml b/.../catalog.kubedb.com_rabbitmqversions.yaml → .../catalog.kubedb.com_rabbitmqversions.yaml
diff --git a/...rds/catalog.kubedb.com_redisversions.yaml → ...rds/catalog.kubedb.com_redisversions.yaml b/...rds/catalog.kubedb.com_redisversions.yaml → ...rds/catalog.kubedb.com_redisversions.yaml
diff --git a/...talog.kubedb.com_singlestoreversions.yaml → ...talog.kubedb.com_singlestoreversions.yaml b/...talog.kubedb.com_singlestoreversions.yaml → ...talog.kubedb.com_singlestoreversions.yaml
diff --git a/...crds/catalog.kubedb.com_solrversions.yaml → ...crds/catalog.kubedb.com_solrversions.yaml b/...crds/catalog.kubedb.com_solrversions.yaml → ...crds/catalog.kubedb.com_solrversions.yaml
diff --git a/...catalog.kubedb.com_zookeeperversions.yaml → ...catalog.kubedb.com_zookeeperversions.yaml b/...catalog.kubedb.com_zookeeperversions.yaml → ...catalog.kubedb.com_zookeeperversions.yaml
diff --git a/charts/kubedb-catalog/templates/crds.yaml b/charts/kubedb-catalog/templates/crds.yaml
@@ -0,0 +1,33 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{- if .Values.installCRDs }}
+
+{{ $overrides := printf `
+metadata:
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,pre-rollback
+` | fromYaml }}
+
+{{- range $db, $enabled := $featureGates }}
+{{- if $enabled }}
+
+{{- $path := printf "files/crds/catalog.kubedb.com_%sversions.yaml" ($db | lower) }}
+{{- $crd := $.Files.Get $path | fromYaml }}
+{{- $crd = mergeOverwrite $crd $overrides }}
+{{- $crd | toYaml }}
+---
+
+{{- if eq $db "Kafka" }}
+{{ $path := "files/crds/catalog.kubedb.com_kafkaconnectorversions.yaml" }}
+{{- $crd := $.Files.Get $path | fromYaml }}
+{{- $crd = mergeOverwrite $crd $overrides }}
+{{- $crd | toYaml }}
+---
+{{- end }}
+
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/kubedb-catalog/values.openapiv3_schema.yaml b/charts/kubedb-catalog/values.openapiv3_schema.yaml
@@ -5,6 +5,8 @@ properties:
     type: object
   fullnameOverride:
     type: string
+  installCRDs:
+    type: boolean
   nameOverride:
     type: string
   proxies:
@@ -136,6 +138,7 @@ properties:
     type: boolean
 required:
 - featureGates
+- installCRDs
 - psp
 - skipDeprecated
 type: object
diff --git a/charts/kubedb-catalog/values.yaml b/charts/kubedb-catalog/values.yaml
@@ -76,5 +76,8 @@ psp:
     allowPrivilegeEscalation: false
     privileged: false
 
+# Set true to install CRDs
+installCRDs: false
+
 # Set true to avoid deploying deprecated versions
 skipDeprecated: true
diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml
@@ -1534,6 +1534,8 @@ properties:
         type: object
       fullnameOverride:
         type: string
+      installCRDs:
+        type: boolean
       nameOverride:
         type: string
       proxies:
@@ -1666,6 +1668,7 @@ properties:
     required:
     - enabled
     - featureGates
+    - installCRDs
     - psp
     - skipDeprecated
     type: object

diff --git a/hack/scripts/import-crds.sh b/hack/scripts/import-crds.sh
@@ -77,7 +77,7 @@ if [ "$update_kubedb_crds" = true ] && [ -d ${crd_dir} ]; then
 
     crd-importer \
         --input=${crd_dir} \
-        --out=./charts/kubedb-catalog/crds \
+        --out=./charts/kubedb-catalog/files/crds \
         --group=catalog.kubedb.com
 
     crd-importer \