Skip to content

fix: correct the fluent-operator deployment to match the setup.yaml with helm template - #2025

Merged
marcofranssen merged 3 commits into
fluent:masterfrom
cw-Guo:fix/setup
Aug 11, 2026
Merged

fix: correct the fluent-operator deployment to match the setup.yaml with helm template#2025
marcofranssen merged 3 commits into
fluent:masterfrom
cw-Guo:fix/setup

Conversation

@cw-Guo

@cw-Guo cw-Guo commented Aug 3, 2026

Copy link
Copy Markdown
Collaborator

What this PR does / why we need it

Fixes the YAML-based installation regression reported in #1995.

Since #1953, manifests/setup/setup.yaml has been generated from the Kustomize configuration. However, the manager Deployment in config/manager/manager.yaml was not aligned with the Helm chart defaults.

The generated Deployment explicitly enabled the secure metrics endpoint on port 8443 while using a read-only root filesystem. Without a provided certificate, controller-runtime attempts to generate certificates under /tmp/k8s-metrics-server, which can prevent the operator from starting.

This PR aligns the default Kustomize Deployment with the Deployment produced by Helm:

  • Uses the image's /manager entrypoint instead of overriding command.
  • Removes the default leader-election and secure-metrics arguments.
  • Uses the fluent-operator container name.
  • Adds the default CONTAINER_LOG_PATH.
  • Aligns resource limits, probes, container security context, and pod security context.
  • Aligns the declared metrics port with Helm's default port 8080.
  • Keeps HTTPS metrics configuration available as an optional Kustomize patch.

Which issue(s) this PR fixes

Fixes #1995

Files updated

  • config/manager/manager.yaml

    • Aligns the Kustomize manager Deployment with the Helm defaults.
  • config/default/kustomization.yaml

    • Stops enabling secure metrics by default.
    • Documents the optional patches required for HTTPS metrics with cert-manager.
  • config/default/metrics_service.yaml

    • Changes the metrics Service from HTTPS port 8443 to the Helm default port 8080.
  • manifests/setup/setup.yaml

    • Regenerates the published YAML installation bundle from the updated Kustomize configuration.

Validation

  • Compared the generated Kustomize Deployment with the output of helm template using the default values.
  • Ran make test-e2e: all 10 Fluentd e2e specs passed.
  • Verified the operator Deployment becomes Ready in Kind with zero container restarts.
  • Confirmed the operator uses the image entrypoint without explicit command or args.

Does this PR introduce a user-facing change?

Fix the YAML-based installation by aligning the generated operator Deployment with the Helm chart defaults.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the Kustomize-based installation manifests to align the Fluent Operator manager Deployment and metrics Service with the Helm chart defaults, addressing a startup regression caused by secure metrics certificate generation on a read-only filesystem.

Changes:

  • Aligns the manager Deployment spec (entrypoint usage, container name, env, probes, resources, and security contexts) with Helm defaults.
  • Switches the metrics Service from HTTPS/8443 to a metrics port on 8080 and documents HTTPS metrics as an optional patch path.
  • Regenerates the published manifests/setup/setup.yaml bundle from the updated Kustomize config.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.

File Description
config/manager/manager.yaml Reworks the manager Deployment to match Helm defaults (entrypoint/args, ports, security context, probes, resources).
config/default/kustomization.yaml Stops enabling secure metrics by default and updates guidance for optional HTTPS metrics patches.
config/default/metrics_service.yaml Changes the metrics Service port/name to metrics:8080.
manifests/setup/setup.yaml Regenerated install bundle reflecting the updated Kustomize Deployment and Service.

Comment thread config/manager/manager.yaml Outdated
Comment thread config/default/kustomization.yaml
Comment thread config/default/metrics_service.yaml
marcofranssen
marcofranssen previously approved these changes Aug 4, 2026

@marcofranssen marcofranssen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cw-Guo and others added 3 commits August 9, 2026 22:45
Signed-off-by: Chengwei Guo <cwguoz@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Josh Baird <jbaird@galileo.io>
Signed-off-by: Chengwei Guo <cwguoz@gmail.com>
Signed-off-by: Chengwei Guo <cwguoz@gmail.com>
@marcofranssen
marcofranssen merged commit 2a40511 into fluent:master Aug 11, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: yaml based deployment seems to be broken in v3.9.0

4 participants