helm(v4): Breaks fluent-bit-crds out into separate top-level chart (#1795)

joshuabaird · marcofranssen · web-flow · commit 71604fa82b01 · 2025-11-21T19:46:03.000+01:00
* Add new fluent-bit-crds chart. Signed-off-by: Josh Baird <jbaird@galileo.io> * Modify depdendncy. Signed-off-by: Josh Baird <jbaird@galileo.io> * Remove legacy chart. Signed-off-by: Josh Baird <jbaird@galileo.io> * Reset. Signed-off-by: Josh Baird <jbaird@galileo.io> * Update migration doc. Signed-off-by: Josh Baird <jbaird@galileo.io> * Use file references for dev. Signed-off-by: Josh Baird <jbaird@galileo.io> * Use repo URLs for deps. Signed-off-by: Josh Baird <jbaird@galileo.io> * Add cwGuo email. Signed-off-by: Josh Baird <jbaird@galileo.io> * Apply suggestion from @marcofranssen Signed-off-by: Marco Franssen <marco.franssen@gmail.com> * Apply suggestion from @marcofranssen Signed-off-by: Marco Franssen <marco.franssen@gmail.com> * Apply suggestion from @marcofranssen Signed-off-by: Marco Franssen <marco.franssen@gmail.com> * Apply suggestion from @marcofranssen Signed-off-by: Marco Franssen <marco.franssen@gmail.com> --------- Signed-off-by: Josh Baird <jbaird@galileo.io> Signed-off-by: Marco Franssen <marco.franssen@gmail.com> Co-authored-by: Marco Franssen <marco.franssen@gmail.com>
diff --git a/Makefile b/Makefile
@@ -56,7 +56,7 @@ shellcheck:
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentbit/..." output:crd:artifacts:config=config/crd/bases
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentd/..." output:crd:artifacts:config=config/crd/bases
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentbit/..." output:crd:artifacts:config=charts/fluent-operator/charts/fluent-bit-crds/crds
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentbit/..." output:crd:artifacts:config=charts/fluent-bit-crds/templates
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentd/..." output:crd:artifacts:config=charts/fluentd-crds/templates
 	kubectl kustomize config/crd/bases/ | sed -e '/creationTimestamp/d' > manifests/setup/fluent-operator-crd.yaml
 	kubectl kustomize manifests/setup/ | sed -e '/creationTimestamp/d' > manifests/setup/setup.yaml
@@ -389,3 +389,4 @@ update-helm-package: # update helm repo
 .PHONY: helm-docs
 helm-docs:
 	cd charts/fluentd-crds && helm-docs
+	cd charts/fluent-bit-crds && helm-docs
diff --git a/charts/fluent-bit-crds/.helmignore b/charts/fluent-bit-crds/.helmignore
diff --git a/charts/fluent-bit-crds/Chart.yaml b/charts/fluent-bit-crds/Chart.yaml
@@ -0,0 +1,23 @@
+apiVersion: v2
+name: fluent-bit-crds
+description: A helm chart for Fluent-Bit custom resource definitions (CRDs) used by fluent-operator.
+type: application
+version: 0.1.0
+appVersion: 0.1.0
+keywords:
+  - logging
+  - fluentd
+  - fluent-bit
+  - fluent-operator
+home: https://github.com/fluent/fluent-operator
+icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
+sources:
+  - https://github.com/fluent/fluent-operator/tree/master/charts/fluent-bit-crds
+maintainers:
+  - name: cw-guo
+    email: cwguoz@gmail.com
+  - name: marcofranssen
+    email: marco.franssen@gmail.com
+    url: https://marcofranssen.nl
+  - name: joshuabaird
+    email: joshbaird@gmail.com
diff --git a/charts/fluent-bit-crds/README.md b/charts/fluent-bit-crds/README.md
@@ -0,0 +1,29 @@
+# fluent-bit-crds
+
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+
+A helm chart for Fluent-Bit custom resource definitions (CRDs) used by fluent-operator.
+
+**Homepage:** <https://github.com/fluent/fluent-operator>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| cw-guo |  |  |
+| marcofranssen | <marco.franssen@gmail.com> | <https://marcofranssen.nl> |
+| joshuabaird | <joshbaird@gmail.com> |  |
+
+## Source Code
+
+* <https://github.com/fluent/fluent-operator/tree/master/charts/fluent-bit-crds>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| additionalAnnotations | object | `{}` | Additional annotations for the custom resource definitions. |
+
+----------------------------------------------
+
+Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs/).
diff --git a/charts/fluent-bit-crds/README.md.gotmpl b/charts/fluent-bit-crds/README.md.gotmpl
@@ -0,0 +1,20 @@
+{{ template "chart.header" . }}
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+----------------------------------------------
+
+Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs/).
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterfilters.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterfilters.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: clusterfilters.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: clusterfluentbitconfigs.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterinputs.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: clusterinputs.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clustermultilineparsers.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clustermultilineparsers.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: clustermultilineparsers.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusteroutputs.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: clusteroutputs.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterparsers.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_clusterparsers.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: clusterparsers.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_collectors.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_collectors.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: collectors.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_filters.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_filters.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: filters.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_fluentbitconfigs.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_fluentbitconfigs.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: fluentbitconfigs.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_fluentbits.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_fluentbits.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: fluentbits.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_multilineparsers.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_multilineparsers.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: multilineparsers.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_outputs.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_outputs.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: outputs.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/templates/fluentbit.fluent.io_parsers.yaml b/charts/fluent-bit-crds/templates/fluentbit.fluent.io_parsers.yaml
@@ -3,6 +3,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    {{- with .Values.additionalAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     controller-gen.kubebuilder.io/version: v0.18.0
   name: parsers.fluentbit.fluent.io
 spec:
diff --git a/charts/fluent-bit-crds/values.yaml b/charts/fluent-bit-crds/values.yaml
@@ -0,0 +1,2 @@
+# -- Additional annotations for the custom resource definitions.
+additionalAnnotations: {}
diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml
@@ -23,10 +23,9 @@ maintainers:
     email: joshbaird@gmail.com
 dependencies:
   - name: fluent-bit-crds
-    repository: "file://charts/fluent-bit-crds"
-    version: 3.5.0
-    condition: fluentbit.crdsEnable
-  - name: fluentd-crds
     repository: https://fluent.github.io/helm-charts
-    condition: fluentd.enable && fluentd.crdsEnable
     version: 0.1.0
+    condition: fluentbit.enable && fluentbit.crdsEnable
+  - name: fluentd-crds
+    version: 0.1.0
+    condition: fluentd.enable && fluentd.crdsEnable
diff --git a/charts/fluent-operator/MIGRATION-v4.md b/charts/fluent-operator/MIGRATION-v4.md
@@ -6,7 +6,7 @@ Major changes/themes for v4.0:
 
 1. **Container Runtime Simplification**: Removes dynamic detection for the `docker` runtime via initContainers and adopts static, configuration-based paths. The `docker` runtime has not been used widely since Kubernetes v1.24 (2022) and modern Kubernetes distributions now use the `containerd` runtime.
 
-2. **fluentd-crd lifecycle changes**: Fluentd CRDs have been moved from an embedded sub-chart to a separate, independently versioned `fluentd-crds` chart hosted in the Fluent Helm repository. CRDs are now in the `templates/` directory, enabling automatic upgrades via `helm upgrade`. **Important:** CRDs will now be deleted on `helm uninstall` unless protected with the `helm.sh/resource-policy: keep` annotation (see below for details).
+2. **CRD lifecycle changes**: Both Fluent Bit and Fluentd CRDs have been moved from embedded sub-charts to separate, independently versioned `fluent-bit-crds` and `fluentd-crds` charts hosted in the Fluent Helm repository. CRDs are now in the `templates/` directory, enabling automatic upgrades via `helm upgrade`. **Important:** CRDs will now be deleted on `helm uninstall` unless protected with the `helm.sh/resource-policy: keep` annotation (see below for details).
 
 ## Breaking Changes
 
@@ -143,10 +143,11 @@ containerRuntime: docker
 # to use the standard path
 ```
 
-## Fluentd CRDs Moved to Separate Chart with Automatic Upgrades
+## CRDs Moved to Separate Charts with Automatic Upgrades
 
 **What Changed:**
 
+- Fluent Bit CRDs moved from embedded sub-chart to separate `fluent-bit-crds` chart in the Fluent Helm repository
 - Fluentd CRDs moved from embedded sub-chart to separate `fluentd-crds` chart in the Fluent Helm repository
 - CRDs relocated from `crds/` directory to `templates/` directory, changing their lifecycle behavior
 
@@ -157,6 +158,7 @@ containerRuntime: docker
 
 **Who Is Affected:**
 
+- All users who use Fluent Bit with the fluent-operator
 - All users who use Fluentd with the fluent-operator
 - Users who rely on CRDs and custom resources persisting after chart uninstall
 
@@ -165,30 +167,35 @@ containerRuntime: docker
 Before installing or upgrading, ensure the Fluent Helm repository is added:
 
 ```bash
-# Add the Fluent Helm repository (required for the dependency)
+# Add the Fluent Helm repository (required for the dependencies)
 helm repo add fluent https://fluent.github.io/helm-charts
 helm repo update
 
-# Install or upgrade fluent-operator (CRDs installed automatically via dependency)
+# Install or upgrade fluent-operator (CRDs installed automatically via dependencies)
 helm upgrade --install fluent-operator fluent/fluent-operator \
   --version 4.0.0 \
+  --set fluentbit.enable=true \
   --set fluentd.enable=true
 ```
 
-**Note:** Helm will automatically manage the `fluentd-crds` dependency when `fluentd.enable=true` and `fluentd.crdsEnable=true` (default).
+**Note:** Helm will automatically manage the CRD chart dependencies:
+- `fluent-bit-crds` when `fluentbit.enable=true` and `fluentbit.crdsEnable=true` (default)
+- `fluentd-crds` when `fluentd.enable=true` and `fluentd.crdsEnable=true` (default)
 
 **Protecting CRDs from Deletion:**
 
-To prevent CRDs from being deleted when the `fluentd-crds` chart is uninstalled, add the `helm.sh/resource-policy: keep` annotation:
+To prevent CRDs from being deleted when the CRD charts are uninstalled, add the `helm.sh/resource-policy: keep` annotation:
 
 ```bash
 helm upgrade --install fluent-operator fluent/fluent-operator \
   --version 4.0.0 \
+  --set fluentbit.enable=true \
   --set fluentd.enable=true \
+  --set fluent-bit-crds.additionalAnnotations."helm\.sh/resource-policy"=keep \
   --set fluentd-crds.additionalAnnotations."helm\.sh/resource-policy"=keep
 ```
 
-With this annotation, Helm will preserve the CRDs and all Fluentd custom resources even if the chart is uninstalled.
+With this annotation, Helm will preserve the CRDs and all custom resources even if the charts are uninstalled.
 
 ## Forward Looking: Planned Changes in v5.0
 
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml b/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/values.yaml b/charts/fluent-operator/charts/fluent-bit-crds/values.yaml
diff --git a/hack/mutate-crds.sh b/hack/mutate-crds.sh
@@ -4,6 +4,7 @@
 
 CRDS=(
   charts/fluentd-crds/templates/*.yaml
+  charts/fluent-bit-crds/templates/*.yaml
 )
 for CRD in "${CRDS[@]}"
 do
