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.

Sign up for GitHub

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

Jump to bottom

[helm]: forward agent providers configuration for fleet mode #5912

Merged
merged 2 commits into from
Nov 4, 2024
Merged

[helm]: forward agent providers configuration for fleet mode #5912

merged 2 commits into from
Nov 4, 2024

Conversation

pkoutsovasilis
Copy link
Contributor

@pkoutsovasilis pkoutsovasilis commented Nov 1, 2024 •
edited
Loading

What does this PR do?

This PR forwards providers configuration for managed agents (fleet mode)

Why is it important?

Because users need to be able to disable/enabled leader election or/and kubernetes providers for managed agents

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

mage helm:renderExamples
mage integration:kubernetesMatrix

Related issues

@pkoutsovasilis pkoutsovasilis added enhancement New feature or request skip-changelog backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify labels Nov 1, 2024
@pkoutsovasilis pkoutsovasilis self-assigned this Nov 1, 2024
@pkoutsovasilis pkoutsovasilis changed the title feat: forward agent providers configuration for fleet mode [helm]: forward agent providers configuration for fleet mode Nov 1, 2024
@pkoutsovasilis pkoutsovasilis force-pushed the helm/pass_providers_config_fleet branch from 6770601 to 9d7d1fe Compare November 1, 2024 11:20
@michalpristas
Copy link
Contributor

please don't forget to add proper Team label

@pkoutsovasilis pkoutsovasilis added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Nov 4, 2024
@pkoutsovasilis pkoutsovasilis marked this pull request as ready for review November 4, 2024 09:51
@pkoutsovasilis pkoutsovasilis requested a review from a team as a code owner November 4, 2024 09:51
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

swiatekm
swiatekm approved these changes Nov 4, 2024
View reviewed changes
Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

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

LGTM, but I think we should have an example for fleet mode as well. Can be added in a follow up.

@pkoutsovasilis
Copy link
Contributor Author

pkoutsovasilis commented Nov 4, 2024 •
edited
Loading

LGTM, but I think we should have an example for fleet mode as well. Can be added in a follow up.

UPDATE: @swiatekm I added an example, so if you can please give this one another look 🙂

Thank you when I switched this PR from draft to ready today, I had this feeling that I was forgetting something that I couldn't recall; but you just found it and it was to add a fleet managed example. 🙂 I will push one about it in this PR

swiatekm
swiatekm approved these changes Nov 4, 2024
View reviewed changes
Copy link
Contributor

@swiatekm swiatekm left a comment

Choose a reason for hiding this comment

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

👍

deploy/helm/elastic-agent/examples/fleet-managed/README.md Outdated Show resolved Hide resolved
@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 4, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b helm/pass_providers_config_fleet upstream/helm/pass_providers_config_fleet
git merge upstream/main
git push upstream helm/pass_providers_config_fleet

@pkoutsovasilis pkoutsovasilis force-pushed the helm/pass_providers_config_fleet branch from a4ac215 to 28376b8 Compare November 4, 2024 19:49
@pkoutsovasilis pkoutsovasilis enabled auto-merge (squash) November 4, 2024 19:50
@elastic-sonarqube Elastic SonarQube
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

@pkoutsovasilis pkoutsovasilis merged commit 9d2c3c9 into elastic:main Nov 4, 2024
9 checks passed
mergify bot pushed a commit that referenced this pull request Nov 4, 2024
@pkoutsovasilis @mergify
[helm]: forward agent providers configuration for fleet mode (#5912)
21cf1aa 
* feat: forward agent providers configuration for fleet mode

* feat: add fleet example

(cherry picked from commit 9d2c3c9)

# Conflicts:
#	deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
#	deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.yaml
mergify bot pushed a commit that referenced this pull request Nov 4, 2024
@pkoutsovasilis @mergify
[helm]: forward agent providers configuration for fleet mode (#5912)
6c9ff6d 
* feat: forward agent providers configuration for fleet mode

* feat: add fleet example

(cherry picked from commit 9d2c3c9)

# Conflicts:
#	deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
#	deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.yaml
This was referenced Nov 4, 2024
Merged
Merged
pkoutsovasilis added a commit that referenced this pull request Nov 5, 2024
@mergify @pkoutsovasilis
[8.16](backport #5912) [helm]: forward agent providers configuration …
e0150a5 
…for fleet mode (#5934)

* [helm]: forward agent providers configuration for fleet mode (#5912)

* feat: forward agent providers configuration for fleet mode

* feat: add fleet example

(cherry picked from commit 9d2c3c9)

# Conflicts:
#	deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
#	deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.yaml

* fix: resolve conflicts

* fix: render Helm examples

---------

Co-authored-by: Panos Koutsovasilis <[email protected]>
pkoutsovasilis added a commit that referenced this pull request Nov 5, 2024
@mergify @pkoutsovasilis
[8.x](backport #5912) [helm]: forward agent providers configuration f…
5b34d43 
…or fleet mode (#5935)

* [helm]: forward agent providers configuration for fleet mode (#5912)

* feat: forward agent providers configuration for fleet mode

* feat: add fleet example

(cherry picked from commit 9d2c3c9)

# Conflicts:
#	deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
#	deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
#	deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.yaml

* fix: resolve conflicts

* fix: render Helm examples

---------

Co-authored-by: Panos Koutsovasilis <[email protected]>
oakrizan pushed a commit that referenced this pull request Nov 7, 2024
@pkoutsovasilis @oakrizan
[helm]: forward agent providers configuration for fleet mode (#5912)
8984353 
* feat: forward agent providers configuration for fleet mode

* feat: add fleet example
@ycombinator ycombinator mentioned this pull request Nov 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@swiatekm swiatekm swiatekm approved these changes

@blakerouse blakerouse Awaiting requested review from blakerouse blakerouse is a code owner automatically assigned from elastic/elastic-agent-control-plane

@michel-laterman michel-laterman Awaiting requested review from michel-laterman michel-laterman is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@pkoutsovasilis pkoutsovasilis

Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify enhancement New feature or request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pkoutsovasilis @michalpristas @elasticmachine @swiatekm