feat(helm-chart): seperate CRDs into subchart

Signed-off-by: Sebastian Gaiser <[email protected]>
kube-logging · Dec 4, 2023 · 61bee0b · 61bee0b
1 parent b4347c3
commit 61bee0b
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -142,7 +142,7 @@ manager: codegen fmt vet ## Build manager binary
 manifests: ${CONTROLLER_GEN} ## Generate manifests e.g. CRD, RBAC etc.
 	cd pkg/sdk && $(CONTROLLER_GEN) $(CRD_OPTIONS) webhook paths="./..." output:crd:artifacts:config=../../config/crd/bases output:webhook:artifacts:config=../../config/webhook
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./controllers/..." output:rbac:artifacts:config=./config/rbac
-	cp config/crd/bases/* charts/logging-operator/crds/
+	cp config/crd/bases/* charts/logging-operator/charts/crds/templates/
 	echo "{{- if .Values.rbac.enabled }}" > ./charts/logging-operator/templates/clusterrole.yaml
 	cat config/rbac/role.yaml | sed -e 's@manager-role@{{ template "logging-operator.fullname" . }}@' | sed -e '/creationTimestamp/d' | cat >> ./charts/logging-operator/templates/clusterrole.yaml
 	echo "{{- end }}" >> ./charts/logging-operator/templates/clusterrole.yaml

diff --git a/charts/logging-operator/Chart.yaml b/charts/logging-operator/Chart.yaml
@@ -13,3 +13,7 @@ home: https://kube-logging.github.io
 sources:
   - https://github.com/kube-logging/logging-operator
   - https://github.com/kube-logging/helm-charts/tree/main/charts/logging-operator
+dependencies:
+  - name: crds
+    condition: crds.enabled
+    version: 0.0.0
diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md
@@ -28,7 +28,9 @@ This chart bootstraps a [Logging Operator](https://github.com/kube-logging/loggi
 
 ## Installing CRDs
 
-Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs from the `crds` folder and from templates at the same time.
+Use `createCustomResource=false` (deprecated) with Helm v3 to avoid trying to create CRDs from the `crds` folder and from templates at the same time.
+The prefered way is to install the crds via the subchart.
+This could be disabled by setting `crds.enabled=false`.
 
 ## Values
 

diff --git a/charts/logging-operator/charts/crds/Charts.yaml b/charts/logging-operator/charts/crds/Charts.yaml
@@ -0,0 +1,7 @@
+apiVersion: v2
+type: application
+name: crds
+version: 0.0.0
+appVersion: latest
+description: Logging-operator CRDs.
+home: https://kube-logging.github.io
diff --git a/...tensions.banzaicloud.io_eventtailers.yaml → ...tensions.banzaicloud.io_eventtailers.yaml b/...tensions.banzaicloud.io_eventtailers.yaml → ...tensions.banzaicloud.io_eventtailers.yaml
diff --git a/...xtensions.banzaicloud.io_hosttailers.yaml → ...xtensions.banzaicloud.io_hosttailers.yaml b/...xtensions.banzaicloud.io_hosttailers.yaml → ...xtensions.banzaicloud.io_hosttailers.yaml
diff --git a/.../logging.banzaicloud.io_clusterflows.yaml → .../logging.banzaicloud.io_clusterflows.yaml b/.../logging.banzaicloud.io_clusterflows.yaml → .../logging.banzaicloud.io_clusterflows.yaml
diff --git a/...ogging.banzaicloud.io_clusteroutputs.yaml → ...ogging.banzaicloud.io_clusteroutputs.yaml b/...ogging.banzaicloud.io_clusteroutputs.yaml → ...ogging.banzaicloud.io_clusteroutputs.yaml
diff --git a/...or/crds/logging.banzaicloud.io_flows.yaml → ...mplates/logging.banzaicloud.io_flows.yaml b/...or/crds/logging.banzaicloud.io_flows.yaml → ...mplates/logging.banzaicloud.io_flows.yaml
diff --git a/...gging.banzaicloud.io_fluentbitagents.yaml → ...gging.banzaicloud.io_fluentbitagents.yaml b/...gging.banzaicloud.io_fluentbitagents.yaml → ...gging.banzaicloud.io_fluentbitagents.yaml
diff --git a/...logging.banzaicloud.io_loggingroutes.yaml → ...logging.banzaicloud.io_loggingroutes.yaml b/...logging.banzaicloud.io_loggingroutes.yaml → ...logging.banzaicloud.io_loggingroutes.yaml
diff --git a/...crds/logging.banzaicloud.io_loggings.yaml → ...ates/logging.banzaicloud.io_loggings.yaml b/...crds/logging.banzaicloud.io_loggings.yaml → ...ates/logging.banzaicloud.io_loggings.yaml
diff --git a/...ds/logging.banzaicloud.io_nodeagents.yaml → ...es/logging.banzaicloud.io_nodeagents.yaml b/...ds/logging.banzaicloud.io_nodeagents.yaml → ...es/logging.banzaicloud.io_nodeagents.yaml
diff --git a/.../crds/logging.banzaicloud.io_outputs.yaml → ...lates/logging.banzaicloud.io_outputs.yaml b/.../crds/logging.banzaicloud.io_outputs.yaml → ...lates/logging.banzaicloud.io_outputs.yaml
diff --git a/....banzaicloud.io_syslogngclusterflows.yaml → ....banzaicloud.io_syslogngclusterflows.yaml b/....banzaicloud.io_syslogngclusterflows.yaml → ....banzaicloud.io_syslogngclusterflows.yaml
diff --git a/...anzaicloud.io_syslogngclusteroutputs.yaml → ...anzaicloud.io_syslogngclusteroutputs.yaml b/...anzaicloud.io_syslogngclusteroutputs.yaml → ...anzaicloud.io_syslogngclusteroutputs.yaml
diff --git a/...logging.banzaicloud.io_syslogngflows.yaml → ...logging.banzaicloud.io_syslogngflows.yaml b/...logging.banzaicloud.io_syslogngflows.yaml → ...logging.banzaicloud.io_syslogngflows.yaml
diff --git a/...gging.banzaicloud.io_syslogngoutputs.yaml → ...gging.banzaicloud.io_syslogngoutputs.yaml b/...gging.banzaicloud.io_syslogngoutputs.yaml → ...gging.banzaicloud.io_syslogngoutputs.yaml
diff --git a/charts/logging-operator/templates/crds.yaml b/charts/logging-operator/templates/crds.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.createCustomResource -}}
-{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
+{{- range $path, $bytes := .Files.Glob "charts/crds/templates/*.yaml" }}
 {{ $.Files.Get $path }}
 ---
 {{- end }}

diff --git a/charts/logging-operator/values.yaml b/charts/logging-operator/values.yaml
@@ -37,6 +37,10 @@ annotations: {}
 # -- Deploy CRDs used by Logging Operator.
 createCustomResource: false
 
+# -- Deploy CRDs as subchart.
+crds:
+  enabled: true
+
 http:
   # -- HTTP listen port number.
   port: 8080