feat: clean the config and fix the manifests generation

.github/workflows/release-tool.yaml

@@ -84,19 +84,15 @@ jobs:
 
       - name: Update manifest files
         run: |
-          # Update deployment manifests
-          files=(
-            "manifests/setup/fluent-operator-deployment.yaml"
-            "manifests/setup/setup.yaml"
-          )
-          for file in "${files[@]}"; do
-            if [ -f "$file" ]; then
-              sed -i 's/fluent-operator:latest/fluent-operator:v${{ needs.validate-and-prepare.outputs.version_without_v }}/' "$file"
-            else
-              echo "Warning: File $file not found"
-              exit 1
-            fi
-          done
+          # Bump the operator image tag in the kustomize images: transformer.
+          # config/default/kustomization.yaml is the single source of truth;
+          # manifests/setup/setup.yaml is regenerated below.
+          if [ ! -f "config/default/kustomization.yaml" ]; then
+            echo "Error: config/default/kustomization.yaml not found"
+            exit 1
+          fi
+          sed -i 's|newTag: .*|newTag: v${{ needs.validate-and-prepare.outputs.version_without_v }}|' config/default/kustomization.yaml
+          make manifests
 
       - name: Update Helm chart values
         run: |
@@ -124,8 +120,8 @@ jobs:
 
             ### Changes
             The following files have been updated:
-            - manifests/setup/fluent-operator-deployment.yaml
-            - manifests/setup/setup.yaml
+            - config/default/kustomization.yaml (image tag)
+            - manifests/setup/setup.yaml (regenerated)
             - charts/fluent-operator/values.yaml
             - VERSION
 

.gitignore

@@ -26,3 +26,6 @@ testbin/
 .DS_Store
 .envrc
 charts/fluent-operator.tgz
+
+.cache
+.claude

Makefile

@@ -51,16 +51,20 @@ help: ## Display this help.
 shellcheck:
 	@find . -type f -name *.sh -exec docker run --rm -v $(shell pwd):/mnt koalaman/shellcheck:stable {} +
 
+MANIFEST_PATHS := ./apis/fluentbit/...;./apis/fluentd/...;./controllers/...
+
 .PHONY: manifests
 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/crds
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentd/..." output:crd:artifacts:config=charts/fluent-operator/crds
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentbit/..." output:crd:artifacts:config=charts/fluent-operator-fluent-bit-crds/templates
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./apis/fluentd/..." output:crd:artifacts:config=charts/fluent-operator-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
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=fluent-operator webhook \
+		paths="$(MANIFEST_PATHS)" \
+		output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="$(MANIFEST_PATHS)" \
+		output:crd:artifacts:config=charts/fluent-operator/crds
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./apis/fluentbit/...;./controllers/..." \
+		output:crd:artifacts:config=charts/fluent-operator-fluent-bit-crds/templates
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./apis/fluentd/...;./controllers/..." \
+		output:crd:artifacts:config=charts/fluent-operator-fluentd-crds/templates
+	kubectl kustomize config/default/ | sed -e '/creationTimestamp/d' > manifests/setup/setup.yaml
 	hack/mutate-crds.sh
 
 .PHONY: generate

cmd/fluent-manager/Dockerfile

@@ -26,6 +26,6 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /
 COPY --from=builder /workspace/manager .
-USER nonroot:nonroot
+USER 65532:65532
 
 ENTRYPOINT ["/manager"]

config/crd/kustomization.yaml

@@ -1,56 +1,37 @@
 # This kustomization.yaml is not intended to be run by itself,
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
-# resources:
-# - bases/fluentbit.fluent.io_fluentbitconfigs.yaml
-# - bases/fluentbit.fluent.io_fluentbits.yaml
-# - bases/fluentbit.fluent.io_inputs.yaml
-# - bases/fluentbit.fluent.io_filters.yaml
-# - bases/fluentbit.fluent.io_outputs.yaml
-# - bases/fluentbit.fluent.io_parsers.yaml
-# - bases/fluentd.fluent.io_fluentds.yaml
-# - bases/fluentd.fluent.io_clusterfluentdconfigs.yaml
-# - bases/fluentd.fluent.io_fluentdconfigs.yaml
-# - bases/fluentd.fluent.io_clusterfilters.yaml
-# - bases/fluentd.fluent.io_filters.yaml
-# - bases/fluentd.fluent.io_outputs.yaml
-# - bases/fluentd.fluent.io_clusteroutputs.yaml
-#+kubebuilder:scaffold:crdkustomizeresource
+resources:
+- bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
+- bases/fluentbit.fluent.io_fluentbits.yaml
+- bases/fluentbit.fluent.io_clusterinputs.yaml
+- bases/fluentbit.fluent.io_clusterfilters.yaml
+- bases/fluentbit.fluent.io_clustermultilineparsers.yaml
+- bases/fluentbit.fluent.io_clusteroutputs.yaml
+- bases/fluentbit.fluent.io_clusterparsers.yaml
+- bases/fluentbit.fluent.io_collectors.yaml
+- bases/fluentbit.fluent.io_fluentbitconfigs.yaml
+- bases/fluentbit.fluent.io_filters.yaml
+- bases/fluentbit.fluent.io_multilineparsers.yaml
+- bases/fluentbit.fluent.io_outputs.yaml
+- bases/fluentbit.fluent.io_parsers.yaml
+- bases/fluentd.fluent.io_fluentds.yaml
+- bases/fluentd.fluent.io_clusterfluentdconfigs.yaml
+- bases/fluentd.fluent.io_fluentdconfigs.yaml
+- bases/fluentd.fluent.io_filters.yaml
+- bases/fluentd.fluent.io_clusterinputs.yaml
+- bases/fluentd.fluent.io_inputs.yaml
+- bases/fluentd.fluent.io_clusterfilters.yaml
+- bases/fluentd.fluent.io_outputs.yaml
+- bases/fluentd.fluent.io_clusteroutputs.yaml
+# +kubebuilder:scaffold:crdkustomizeresource
 
-# patchesStrategicMerge:
+#patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
-# - patches/webhook_in_fluentbitconfigs.yaml
-# - patches/webhook_in_fluentbits.yaml
-# - patches/webhook_in_inputs.yaml
-# - patches/webhook_in_filters_fluentbit.yaml
-# - patches/webhook_in_outputs_fluentbit.yaml
-# - patches/webhook_in_parsers.yaml
-# - patches/webhook_in_fluentds.yaml
-# - patches/webhook_in_clusterfluentdconfigs.yaml
-# - patches/webhook_in_fluentdconfigs.yaml
-# - patches/webhook_in_clusterfilters.yaml
-# - patches/webhook_in_clusteroutputs.yaml
-# - patches/webhook_in_filters_fluentd.yaml
-# - patches/webhook_in_outputs_fluentd.yaml
-#+kubebuilder:scaffold:crdkustomizewebhookpatch
-
-# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
-# patches here are for enabling the CA injection for each CRD
-# - patches/cainjection_in_fluentbitconfigs.yaml
-# - patches/cainjection_in_fluentbits.yaml
-# - patches/cainjection_in_inputs.yaml
-# - patches/cainjection_in_filters_fluentbit.yaml
-# - patches/cainjection_in_outputs_fluentbit.yaml
-# - patches/cainjection_in_parsers.yaml
-# - patches/cainjection_in_fluentds.yaml
-# - patches/cainjection_in_clusterfluentdconfigs.yaml
-# - patches/cainjection_in_fluentdconfigs.yaml
-# - patches/cainjection_in_clusterfilters.yaml
-# - patches/cainjection_in_clusteroutputs.yaml
-# - patches/cainjection_in_filters_fluentd.yaml
-# - patches/cainjection_in_outputs_fluentd.yamlpatch
+# +kubebuilder:scaffold:crdkustomizewebhookpatch
 
+# [WEBHOOK] To enable webhook, uncomment the following section
 # the following config is for teaching kustomize how to do kustomization for CRDs.
-configurations:
-- kustomizeconfig.yaml
+#configurations:
+#- kustomizeconfig.yaml