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

v1.9 backports 2020-11-23 #14139

Merged
merged 11 commits into from
Nov 25, 2020
Merged

v1.9 backports 2020-11-23 #14139

merged 11 commits into from
Nov 25, 2020

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Nov 23, 2020

Once this PR is merged, you can update the PR labels via:

$ for pr in 14083 14111; do contrib/backporting/set-labels.py $pr done 1.9; done

[ upstream commit b8a9c79 ]

This should allow external sites to better represent Cilium in artifacts
generated from the Helm charts.

Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 476133a ]

Expand the charts to include other common fields so that external
systems can pull & use icons, tags, k8s version support, etc.

Furthermore, flesh out the readme so it renders better.

While we're at it, add an SVG without the cilium word so that it's more
likely to render correctly in a square on external sites.

Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 3f0b81a ]

These mostly needed '--' at the start for the helm-docs container to
pick up the descriptions and render them into the README.md.

While we're at it, Remove stuttering via the old go style of typing the
variable at the start of the sentence, use full sentences, and remove
any comments that were named exactly the same as the variable.

Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit e2b3707 ]

This was not referenced anywhere else, remove it.

Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 25f45b5 ]

This option was too specific and doesn't make sense to expose as a
user-visible flag in the helm charts. Remove it.

Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit cb98323 ]

Artifact Hub suggests that if we add such annotations to our charts,
then they will show up in the Artifact Hub UI somewhere:

https://artifacthub.io/docs/topics/annotations/helm/

Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit e363b4a ]

v1.10 will need more than the first 3 digits of the version semver, it
will need the full $major.$minor. Fix this up.

Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer requested a review from a team as a code owner November 23, 2020 21:24
@joestringer joestringer added backport/1.9 kind/backports This PR provides functionality previously merged into master. labels Nov 23, 2020
joestringer and others added 4 commits November 23, 2020 13:27
[ upstream commit ad865cd ]

Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 0611e22 ]

Signed-off-by: Chris Tarazi <chris@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 3631267 ]

Now that cilium/cilium-sysdump#96 has been
merged, we no longer have a 30m default for --since. Instead,
cilium-sysdump will no longer have time-based default limits; it will
default to collecting the entire history.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit 0d578a8 ]

This commit clarifies the cilium-sysdump methods of limiting the size of
the sysdump to ensure the user is aware of the most effective approach.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer
Copy link
Member Author

test-backport-1.9

@errordeveloper
Copy link
Contributor

@joestringer would you entertain the possibility of including #14134 also?

@joestringer
Copy link
Member Author

@errordeveloper makes sense to backport that, we can roll that PR into the next round of backports.

@joestringer
Copy link
Member Author

joestringer commented Nov 24, 2020

Hit GKE infrastructure issue: https://jenkins.cilium.io/job/Cilium-PR-K8s-GKE/3373/

Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

LGTM for my commits

@joestringer
Copy link
Member Author

joestringer commented Nov 24, 2020

retest-gke

EDIT: Infrastructure issues: https://jenkins.cilium.io/job/Cilium-PR-K8s-GKE/3381/

@joestringer
Copy link
Member Author

retest-gke

@joestringer joestringer merged commit ddca71e into v1.9 Nov 25, 2020
@joestringer joestringer deleted the pr/v1.9-backport-2020-11-23 branch November 25, 2020 23:15
@aanm aanm mentioned this pull request Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants