Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/spinnaker] Fix chart not being upgradable #13978

Merged
merged 8 commits into from
Jun 21, 2019
Merged

[stable/spinnaker] Fix chart not being upgradable #13978

merged 8 commits into from
Jun 21, 2019

Conversation

skaji
Copy link
Contributor

@skaji skaji commented May 20, 2019

What this PR does / why we need it:

Fix chart not being upgradable;
don't include mutable values in spec.volumeClaimTemplates.metadata.labels

Which issue this PR fixes

Special notes for your reviewer:

See #7803 for explanation.

Checklist

  • DCO signed
  • Chart Version bumped
  • title of the PR contains starts with chart name e.g. [stable/chart]

skaji added 2 commits May 20, 2019 13:17
@skaji
[stable/spinnaker] don't include mutable values in spec.volumeClaimTe…
2ba9f07 
…mplates.metadata.labels

Signed-off-by: Shoichi Kaji <skaji@cpan.org>
@skaji
[stable/spinnaker] update to 1.10.0
b8692fb 
Signed-off-by: Shoichi Kaji <skaji@cpan.org>
@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 20, 2019
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 20, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @skaji. Thanks for your PR.

I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@skaji
Copy link
Contributor Author

skaji commented May 20, 2019

/assign @dwardu89

dwardu89
dwardu89 reviewed May 20, 2019
View reviewed changes
stable/spinnaker/templates/statefulsets/halyard.yaml Outdated
@@ -143,7 +143,9 @@ spec:
- metadata:
name: halyard-home
labels:
{{ include "spinnaker.standard-labels" . | indent 8 }}
app: {{ include "spinnaker.fullname" . | quote }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Would it be better to place these values in a helper, then reference it to be something as follows?
{{ include "spinnaker.standard-labels-base" . | indent 8 }}

I know it is another layer of abstraction, but we can use the base labels for other parts of the chart where necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dwardu89 Thanks for your review.
The commit 50efbac defines "spinnaker.standard-labels-base", and use it.

@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 20, 2019
@skaji
[stable/spinnaker] define spinnaker.standard-labels-base
50efbac 
Signed-off-by: Shoichi Kaji <skaji@cpan.org>
@helm-bot helm-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 20, 2019
@dwardu89
Copy link
Collaborator

/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 28, 2019
skaji added 2 commits May 28, 2019 23:13
@skaji
Merge branch 'master' into fix-spinnaker
8347de5 
Signed-off-by: Shoichi Kaji <skaji@cpan.org>
@skaji
[stable/spinnaker] update to 1.12.0
fd0235a 
Signed-off-by: Shoichi Kaji <skaji@cpan.org>
@k8s-ci-robot k8s-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label May 28, 2019
@skaji
Copy link
Contributor Author

skaji commented May 28, 2019

@dwardu89 I've merged master branch, and bumped version again.
Could you review this again please?

@paulczar
Copy link
Collaborator

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 19, 2019
@paulczar
Copy link
Collaborator

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 21, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dwardu89, paulczar, skaji

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 737fadf into helm:master Jun 21, 2019
anasinnyk pushed a commit to MacPaw/charts that referenced this pull request Jun 29, 2019
@skaji @anasinnyk
[stable/spinnaker] Fix chart not being upgradable (helm#13978)
7786345 
* [stable/spinnaker] don't include mutable values in spec.volumeClaimTemplates.metadata.labels

Signed-off-by: Shoichi Kaji <skaji@cpan.org>

* [stable/spinnaker] update to 1.10.0

Signed-off-by: Shoichi Kaji <skaji@cpan.org>

* [stable/spinnaker] define spinnaker.standard-labels-base

Signed-off-by: Shoichi Kaji <skaji@cpan.org>

* [stable/spinnaker] update to 1.12.0

Signed-off-by: Shoichi Kaji <skaji@cpan.org>
Signed-off-by: Andrii Nasinnyk <anasinnyk@macpaw.com>
davidkarlsen pushed a commit to davidkarlsen/charts that referenced this pull request Jul 3, 2019
@skaji @davidkarlsen
[stable/spinnaker] Fix chart not being upgradable (helm#13978)
67e58e7 
* [stable/spinnaker] don't include mutable values in spec.volumeClaimTemplates.metadata.labels

Signed-off-by: Shoichi Kaji <skaji@cpan.org>

* [stable/spinnaker] update to 1.10.0

Signed-off-by: Shoichi Kaji <skaji@cpan.org>

* [stable/spinnaker] define spinnaker.standard-labels-base

Signed-off-by: Shoichi Kaji <skaji@cpan.org>

* [stable/spinnaker] update to 1.12.0

Signed-off-by: Shoichi Kaji <skaji@cpan.org>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dwardu89 dwardu89 dwardu89 left review comments

@lwander lwander Awaiting requested review from lwander

@viglesiasce viglesiasce Awaiting requested review from viglesiasce

Assignees

@dwardu89 dwardu89

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[stable/spinnaker] can't upgrade spinnaker
5 participants
@skaji @k8s-ci-robot @dwardu89 @paulczar @helm-bot