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

Improve Helm post-setup NOTES #11269

Conversation

soumynathan
Copy link
Contributor

This PR fixes the NOTES.txt file to reflight the correct
action at the upper level, when preflight alone is installed

Fixes: #11245
Signed-off-by: Swaminathan Vasudevan svasudevan@suse.com

@soumynathan soumynathan requested a review from a team April 30, 2020 21:12
@maintainer-s-little-helper
Copy link

Please set the appropriate release note label.

@coveralls
Copy link

coveralls commented Apr 30, 2020

Coverage Status

Coverage decreased (-0.02%) to 44.443% when pulling f33e8df on soumynathan:helm-prints-misleading-notes-with-preflight-alone into 4bdb361 on cilium:master.

@joestringer joestringer added the release-note/misc This PR makes changes that have no direct user impact. label Apr 30, 2020
@joestringer joestringer changed the title Helm prints misleading NOTES upon preflight install Improve Helm post-setup NOTES Apr 30, 2020
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Nice work, the output you posted on the other issue looks accurate and helpful.

We might consider adding an extra piece of notes below this chunk to mention Hubble; other than that I don't think any of the toplevel charts need specific logic to generate different notes.

Two more comments below on phrasing.

@@ -1,4 +1,10 @@
You have successfully installed {{ title .Chart.Name }}.
{{- if (and (.Values.preflight.enabled) (not (.Values.agent.enabled)) (not (.Values.config.enabled)) (not (.Values.operator.enabled))) }}
You have successfully completed the prefight check.
Copy link
Member

Choose a reason for hiding this comment

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

I'm actually wondering about the phrasing here. The only thing we know was successful at this point in time is that the YAMLs were generated and injected into the cluster.

Looking at the preflight check documentation, we actually suggest using another command to monitor the status of the prefilght check until it becomes successful. I wonder if those instructions would be appropriate to include in the snippet here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will check it out and see what makes sense.

install/kubernetes/cilium/templates/NOTES.txt Outdated Show resolved Hide resolved
@soumynathan
Copy link
Contributor Author

Nice work, the output you posted on the other issue looks accurate and helpful.

We might consider adding an extra piece of notes below this chunk to mention Hubble; other than that I don't think any of the toplevel charts need specific logic to generate different notes.

Two more comments below on phrasing.

You are right, I missed the hubble-ui, since it has already merged, we can add that too.

@soumynathan soumynathan force-pushed the helm-prints-misleading-notes-with-preflight-alone branch from 9b522ba to e333e39 Compare April 30, 2020 22:51
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.4 Apr 30, 2020
@joestringer joestringer requested a review from a team April 30, 2020 23:51
Comment on lines +2 to +5
You have successfully ran the prefight check.
Now make sure to check the number of READY pods is the same as the number of running cilium pods.
Then make sure the cilium preflight deployment is also marked READY 1/1.
If you have an issues please refer to the CNP Validation section in the upgrade guide.
Copy link
Member

Choose a reason for hiding this comment

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

I recognize that the user likely already has the upgrade docs up at this point so this should make sense without needing to add a direct link to the upgrade guide.

@aanm
Copy link
Member

aanm commented May 1, 2020

test-me-please

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 4, 2020
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Blocking the merge until https://github.com/cilium/cilium/pull/11269/files#r419407275 has been discussed.

@gandro gandro removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 4, 2020
This PR fixes the NOTES.txt file to reflect the correct
action at the upper level, when preflight alone is installed.

Also adds the NOTES.txt file that was missing for hubble-ui
and handles the hubble-ui and hubble-cli text in the upper
level NOTES.txt file.

Fixes: cilium#11245
Signed-off-by: Swaminathan Vasudevan <svasudevan@suse.com>
@soumynathan soumynathan force-pushed the helm-prints-misleading-notes-with-preflight-alone branch from e333e39 to f33e8df Compare May 4, 2020 17:34
@joestringer joestringer requested a review from gandro May 4, 2020 19:45
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Awesome, thank you!

@gandro
Copy link
Member

gandro commented May 5, 2020

test-me-please

@aanm aanm added the area/helm Impacts helm charts and user deployment experience label May 5, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 5, 2020
@joestringer joestringer merged commit 5f246ba into cilium:master May 5, 2020
1.8.0 automation moved this from In progress to Merged May 5, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.4 May 8, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.4 May 8, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot removed this from Backport pending to v1.7 in 1.7.4 May 9, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.4 May 9, 2020
@gandro
Copy link
Member

gandro commented May 12, 2020

Note to backporters: When backporting this commit, please do not backport the file creation of NOTES.txt in the hubble-ui folder, only the changes to the cilium chart. We don't have the hubble-ui chart in the 1.7 branch.

@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.4 May 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.4 May 12, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.4 May 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm Impacts helm charts and user deployment experience ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.7.4
Backport done to v1.7
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

Helm prints misleading NOTES upon preflight install
7 participants