[kube-prometheus-stack] Add downward compat for Prom CRD #4906
+3
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… fields
Running the latest prom-stack versions on legacy OpenShift clusters with no influence on the preinstalled CRDs results in errors such as this:
failed to create typed patch object (..): .spec.scrapeConfigNamespaceSelector: field not declared in schema
This patch provides a workaround using this values.yaml:
prometheus:
prometheusSpec:
scrapeConfigNamespaceSelector: null
scrapeConfigSelectorNilUsesHelmValues: null
scrapeConfigSelector: null
Signed-off-by: Johannes Schnatterer <[email protected]>
schnatterer
requested review from
andrewgkew,
gianrubio,
gkarthiks,
GMartinez-Sisti,
jkroepke,
QuentinBisson,
scottrigby and
Xtigyro
as code owners
jkroepke
reviewed
Oct 14, 2024
| scrapeConfigSelector: {} | ||
| {{- end }} | ||
| {{- if .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector }} | ||
| scrapeConfigNamespaceSelector: | ||
| {{ tpl (toYaml .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector | indent 4) . }} | ||
| {{ else }} | ||
| {{ else if not (eq .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector nil) }} |
There was a problem hiding this comment.
what not ne instead of not (eq ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it
Running the latest prom-stack versions on legacy OpenShift clusters with no influence on the preinstalled CRDs results in errors such as this:
This PR provides a workaround using this values.yaml:
Yes, this is no ideal solution, but that seems to be what the enterprise-world requires 😐️
At runtime, the operator yields some warnings about the missing fields, but apparently everything else works.
Special notes for your reviewer
As discussed with @jkroepke I'm launching another try to include this feature 🙂
This is the same functionality as in #4818, which unfortunately was reverted in #4883, because it hit a bug in helm helm/helm#12879.
If we go for my original minimally invasive approach, there is no breaking change we won't cause #4878 again.
It won't work for sub charts (because of aforementioned bug in helm) but at least for direct users of kps chart.
Checklist
[prometheus-couchdb-exporter])