fix(helm): inadvertent accumulation of podLabels using merge#16700
fix(helm): inadvertent accumulation of podLabels using merge#16700JStickler merged 7 commits intografana:mainfrom
Conversation
balmeida-nokia
left a comment
There was a problem hiding this comment.
Suggesting an alternative way to deal with merge. Regardless, both ways are valid
production/helm/loki/templates/admin-api/deployment-admin-api.yaml
Outdated
Show resolved
Hide resolved
|
@schahal I'm not from loki, so I can't approve or reject. I just thought I could be useful. So I can't do anything productive about the review request, sorry. |
d6e6fd6 to
5e414e4
Compare
|
@poyzannur @bentonam @JStickler : I feel I followed I tagged you as this should fix a bug that was introduced in #16062 and I'm stuck on the v1.26.0 release due to me needing specific labels on certain workloads (and prefer not to manage an out-of-band chart). Thanks in advance! |
bbfd7c0 to
22ad9d3
Compare
22ad9d3 to
0f6e6c0
Compare
Signed-off-by: Satbir Chahal <satchahal@gmail.com>
|
Hey @schahal, thanks for this I shall get this pushed through internally for review :) |
|
Sorry to miss the ping @schahal |
|
Thanks @poyzannur ! All up-to-date! |
What this PR does / why we need it:
See this issue:
Which issue(s) this PR fixes:
Fixes #16616 and #16617
Special notes for your reviewer:
I got the
deepCopysuggestion from helm/helm#13308 (comment)I tested chart locally before and after change and saw my podLabels as they should be
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR