Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.17](backport #6345) [helm] fleet mode fixes #6426

Open
wants to merge 2 commits into
base: 8.17
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 23, 2024

What does this PR do?

This PR introduces several fixes to the Elastic Agent Helm chart regarding Fleet Mode deployments:

  • Fleet mode now includes the necessary Kubernetes changes (e.g., volume mounts, resource requests) for enabled integrations.
  • Leader election is enabled by default for Fleet mode unless explicitly disabled by the user in the agent preset.
  • Kubernetes integration is now enabled by default.
  • Sets hostNetwork=true for perNode (Daemonset) agent preset, used by kubernetes and system integrations

Why is it important?

These changes are critical as they address bugs 🙂

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test

Disruptive User Impact

N/A

How to test this PR locally

Related issues


This is an automatic backport of pull request #6345 done by [Mergify](https://mergify.com).

* fix: allow fleet mode to do the necessary k8s changes for enabled integrations

* fix: make kubernetes integration enabled by default

* fix: enable leader election for fleet mode unless explicitly disabled by user

* fix: enable hostNetwork for perNode preset

(cherry picked from commit 0d94ead)

# Conflicts:
#	deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
#	deploy/helm/elastic-agent/templates/integrations/_kubernetes/_preset_pernode.tpl
@mergify mergify bot added the backport label Dec 23, 2024
@mergify mergify bot requested a review from a team as a code owner December 23, 2024 08:53
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Dec 23, 2024
@mergify mergify bot requested review from andrzej-stencel and pchila and removed request for a team December 23, 2024 08:53
Copy link
Contributor Author

mergify bot commented Dec 23, 2024

Cherry-pick of 0d94ead has failed:

On branch mergify/bp/8.17/pr-6345
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 0d94ead04.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   deploy/helm/elastic-agent/README.md
	modified:   deploy/helm/elastic-agent/examples/eck/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/fleet-managed/README.md
	modified:   deploy/helm/elastic-agent/examples/fleet-managed/fleet-values.yaml
	modified:   deploy/helm/elastic-agent/examples/fleet-managed/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/system-custom-auth-paths/agent-system-values.yaml
	modified:   deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/examples/user-service-account/rendered/manifest.yaml
	modified:   deploy/helm/elastic-agent/templates/agent/_helpers.tpl
	modified:   deploy/helm/elastic-agent/values.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
	both modified:   deploy/helm/elastic-agent/templates/integrations/_kubernetes/_preset_pernode.tpl

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Dec 23, 2024

This pull request has not been merged yet. Could you please review and merge it @pkoutsovasilis? 🙏

Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants