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

Make helm charts consistent with how fields in spec are handled. (agent only) #8246

Open
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

naemono
Copy link
Contributor

@naemono naemono commented Nov 20, 2024

related: #8184
related: #8192

Details of suggested change

This is the follow-up to #8192, where we are making the eck-agent helm chart consistent in how it handles values that end up within spec, and making it backwards compatible.

Implementation Note

  1. The way this is implemented makes the previous behavior (having .spec.field in the values take precedence over just field in the values.
  2. Mixing these 2 forms of values (some in spec in the values file, some not in spec) likely has unpredictable behavior. (for instance setting spec.http.something, and also setting http.somethingElse)

Signed-off-by: Michael Montgomery <[email protected]>
Signed-off-by: Michael Montgomery <[email protected]>
Simplify esRefs.

Signed-off-by: Michael Montgomery <[email protected]>
naemono and others added 2 commits November 22, 2024 11:47
@naemono
Copy link
Contributor Author

naemono commented Nov 27, 2024

Sorry for delays merging this, I was doing some additional testing manually, and have noticed a bit of an issue I believe with default values. I'll update with more information.

@naemono
Copy link
Contributor Author

naemono commented Nov 27, 2024

Sorry for delays merging this, I was doing some additional testing manually, and have noticed a bit of an issue I believe with default values. I'll update with more information.

This change right here: ebaf618#diff-300fb79f6e3cf107546b30ff8193e64ec1bbf8a52dbe5b5a86fd3dd4bdb83384R111-R116 was causing failures in the fleet-server chart, when using the eck-stack parent chart, and it wasn't caught in our tests and I was wondering why, as there was a test for it. I caught this in some manual testing. This change 6bbdc4f fixes that. @thbkrkr I'd really like for you to give this another look when you can please.

@naemono naemono requested a review from thbkrkr November 27, 2024 18:41
@thbkrkr
Copy link
Contributor

thbkrkr commented Nov 28, 2024

Good catch, still LGTM.

I guess we should do the same for suites declared in deploy/eck-stack/charts/eck-beats/templates/tests/beats-metricbeat-example_test.yaml in #8248.

Not related to this PR, I took another look to values in examples and we could remove the spec field for eck-kibana in:

  • deploy/eck-stack/examples/agent/fleet-agents.yaml
  • deploy/eck-stack/values.yaml

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants