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

[prometheus-blackbox-exporter] fix: only template env if .Values.extraEnv is specified #4354

Merged
merged 2 commits into from
Apr 22, 2024

Conversation

adberger
Copy link
Contributor

What this PR does / why we need it

Currently when .Values.extraEnv is omitted, env is still templated in the deploymen spec.
ArgoCDs new Server-Side Diff is not happy about it.

Failed to compare desired state to live state: failed to calculate diff: error calculating server side diff: serverSideDiff error: error removing non config mutations for resource Deployment/blackbox-exporter-prometheus-blackbox-exporter: error reverting webhook removed fields in predicted live resource: .spec.template.spec.containers: element 0: associative list with keys has an element that omits key field "name" (and doesn't have default value)

This PR solves this issue.

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

Copy link

stale bot commented Apr 22, 2024

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Any further update will cause the issue/pull request to no longer be considered stale. Thank you for your contributions.

@adberger
Copy link
Contributor Author

not stale

Signed-off-by: André Bauer <[email protected]>
@stale stale bot removed the lifecycle/stale label Apr 22, 2024
Copy link
Member

@monotek monotek left a comment

Choose a reason for hiding this comment

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

The need to add ArgoCD specific fixes just sucks but approving anyway...

@monotek monotek merged commit 224e916 into prometheus-community:main Apr 22, 2024
4 checks passed
@adberger
Copy link
Contributor Author

The need to add ArgoCD specific fixes just sucks but approving anyway...

agree..

wilfriedroset pushed a commit to wilfriedroset/helm-charts that referenced this pull request May 8, 2024
…aEnv is specified (prometheus-community#4354)

Signed-off-by: Adrian Berger <[email protected]>
Signed-off-by: André Bauer <[email protected]>
Co-authored-by: André Bauer <[email protected]>
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.

2 participants