refactor: clean the config and fix the manifests generation

.gitignore

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

Makefile

@@ -8,11 +8,12 @@ SHELL = /usr/bin/env bash -o pipefail
 
 VERSION ?= $(shell cat version.txt | tr -d " \t\n\r")
 FB_VERSION?=$(shell grep -v '^#' cmd/fluent-watcher/fluentbit/VERSION | tr -d " \t\n\r")
+FD_VERSION?=$(shell grep -v '^#' cmd/fluent-watcher/fluentd/VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
 FB_IMG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}
 FB_IMG_DEBUG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}-debug
-FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v1.19.2
-FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
+FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v${FD_VERSION}
+FO_IMG ?= ghcr.io/fluent/fluent-operator/fluent-operator:$(VERSION)
 
 ARCH ?= arm64
 
@@ -51,16 +52,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
@@ -135,7 +140,7 @@ build: generate fmt vet ## Build manager binary.
 	go build -o bin/fd-watcher ./cmd/fluent-watcher/fluentd
 
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run cmd/fluent-manager/main.go
+	go run ./cmd/fluent-manager/
 
 # Build amd64/arm64 Fluent Operator container image
 .PHONY: build-op
@@ -200,10 +205,10 @@ push-amd64:
 ##@ Deployment
 
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd/bases/ | kubectl create -f -
+	$(KUSTOMIZE) build config/crd/ | kubectl create -f -
 
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd/bases/ | kubectl delete -f -
+	$(KUSTOMIZE) build config/crd/ | kubectl delete -f -
 
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	kubectl create -f manifests/setup/setup.yaml

README.md

@@ -133,6 +133,7 @@ Kubernetes v1.16.13+ is necessary for running Fluent Operator.
 Install the latest stable version
 
 ```shell
+kubectl create namespace fluent
 kubectl apply -f https://github.com/fluent/fluent-operator/releases/latest/download/setup.yaml
 
 # You can change the namespace in manifests/setup/kustomization.yaml
@@ -143,6 +144,7 @@ kubectl apply -f https://github.com/fluent/fluent-operator/releases/latest/downl
 Install the development version
 
 ```shell
+kubectl create namespace fluent
 kubectl apply -f https://raw.githubusercontent.com/fluent/fluent-operator/master/manifests/setup/setup.yaml
 
 # You can change the namespace in manifests/setup/kustomization.yaml

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