Fix chart rendering when annotations specified #38
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
|
@kocolosk are you able to review? |
|
I just ran into this. 👍 on getting it merged in. Are you able to fix the merge conflict @willholley? |
|
Status? |
|
I do apologise for the bump, but it would be rather helpful to be able to use these annotations if somebody has some time to review this PR? |
kocolosk
approved these changes
Jan 7, 2022
There was a problem hiding this comment.
This looks good, pending a rebase of the chart publishing metadata.
Side comment: I hadn't actually noticed the checksum/config automatic update mechanism before. It seems to me that if we're automatically rolling deployments on general config changes we should also do it when secrets.yaml changes. In fact I'd think that would be the higher priority one to address.
Commit 70b2777 caused user-provided annotations to break the `checksum` StatefulSet annotations. The `{{ with .Values.annotations }}` instruction changes the scope under which the checksum is calculated when user annotations are present. This removes the `{{ with .Values.annotations }}` and instead just writes out the user-provided annotations directly. I've also added a user-provided annotation to the `values.yaml` used in the smoke test to verify the fix. Fixes #37
kocolosk
force-pushed
the
annotations_fix
branch
from
2ac1f58
to
6e46579
Compare
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:
Commit 70b2777 caused user-provided
annotations to break the
checksumStatefulSet annotations. The{{ with .Values.annotations }}instruction changes the scopeunder which the checksum is calculated when user annotations are present.
This removes the
{{ with .Values.annotations }}and instead justwrites out the user-provided annotations directly.
I've also added a user-provided annotation to the
values.yamlusedin the smoke test to verify the fix.
Which issue this PR fixes
Special notes for your reviewer:
Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.