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

Fix having multiple type keys in eck-beats chart #7523

Merged
merged 2 commits into from
Feb 1, 2024

Conversation

naemono
Copy link
Contributor

@naemono naemono commented Feb 1, 2024

This fixes the issue where there were multiple type keys in the rendered eck-beats chart.

❯ helm template . -f examples/filebeat_no_autodiscover.yaml | grep "type: filebeat"
  type: filebeat

Resolves #7487.

Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
@naemono naemono changed the title Use omit to not have multiple type keys in eck-beats chart. Fix having multiple type keys in eck-beats chart. Feb 1, 2024
@naemono naemono requested a review from thbkrkr February 1, 2024 14:10
Copy link
Contributor

@thbkrkr thbkrkr left a comment

Choose a reason for hiding this comment

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

LGTM

@naemono
Copy link
Contributor Author

naemono commented Feb 1, 2024

@elasticmachine run elasticsearch-ci/docs

@naemono naemono merged commit 91d6639 into elastic:main Feb 1, 2024
5 checks passed
@naemono naemono deleted the fix-beats-chart-multiple-type-keys branch February 1, 2024 16:16
@naemono
Copy link
Contributor Author

naemono commented Feb 1, 2024

💚 All backports created successfully

Status Branch Result
2.11

Questions ?

Please refer to the Backport tool documentation

naemono added a commit to naemono/cloud-on-k8s that referenced this pull request Feb 1, 2024
* Fix multiple `type` keys in eck-beats chart.
---------
Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
(cherry picked from commit 91d6639)
naemono added a commit that referenced this pull request Feb 1, 2024
* Fix multiple `type` keys in eck-beats chart.
---------
Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
(cherry picked from commit 91d6639)
@thbkrkr thbkrkr changed the title Fix having multiple type keys in eck-beats chart. Fix having multiple type keys in eck-beats chart Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>bug Something isn't working :helm-charts v2.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

eck-beats/templates/beats.yaml adds spec.type: foo twice
2 participants