Skip to content

v1.6 backports 2020-09-02 #13054

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Sep 3, 2020
Merged

v1.6 backports 2020-09-02 #13054

merged 4 commits into from
Sep 3, 2020

Conversation

christarazi
Copy link
Member

@christarazi christarazi commented Sep 2, 2020 •
edited
Loading

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

$ for pr in 12901 12894 12996 12997; do contrib/backporting/set-labels.py $pr done 1.6; done

sayboras and others added 4 commits September 2, 2020 15:13
@sayboras @christarazi
docs/metrics: Correct label typo equal in metrics.rst
357e95e 
[ upstream commit 85600be ]

This PR is to correct simple typo equal in metrics.rst

Signed-off-by: Tam Mach <sayboras@yahoo.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@Neelajacques @christarazi
Upgrade Cilium docs theme version
6f3916e 
[ upstream commit eeec4d0 ]

Signed-off-by: Nicolas Jacques <neela@isovalent.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@genbit @christarazi
docs: limit copybutton to content area only
ca32ff9 
[ upstream commit 6711a0c ]

Fixes copy button to not conflict with the search

Signed-off-by: Sergey Generalov <sergey@genbit.ru>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@UnwashedMeme @christarazi
fix: node-init should use docker if /etc/crictl.yaml not found
4586f2a 
[ upstream commit 552c823 ]

[ Backporter's notes: The original change contains two locations where
                      the check for crictl.yaml needed to be modified.
                      In the v1.6 tree, only one location contains a
                      reference to crictl.yaml, and this commit modifies
                      it. ]

This script has several tests for what the container runtime situation
looks like to determine how best to restart the underlying containers
(going around the kubelet) so that the new networking configuration
can take effect.

The first test looks to see if the crictl config file is configured to use
docker, but if that file doesn't exist then it fails. I believe docker
is the default if this hasn't been configured at all so if that file
doesn't exist then use docker.

Fixes #12850

Signed-off-by: Nathan Bird <njbird@infiniteenergy.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi requested a review from a team as a code owner September 2, 2020 22:25
@christarazi christarazi added backport/1.6 kind/backports This PR provides functionality previously merged into master. labels Sep 2, 2020
@christarazi
Copy link
Member Author

christarazi commented Sep 2, 2020 •
edited
Loading

test-backport-1.6

Edit: VM provisioning failure.

sayboras
sayboras approved these changes Sep 2, 2020
View reviewed changes
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

Looks good for my changes 👍

@christarazi
Copy link
Member Author

christarazi commented Sep 2, 2020 •
edited
Loading

test-backport-1.6

Edit: VM provisioning failure again.

@christarazi
Copy link
Member Author

test-backport-1.6

@joestringer
Copy link
Member

v1.6 cert expiry issue still.

Looking at the changes being made here, I think I'm happy to accept these backports in without CI since CI is unlikely to catch anything here (+ these already ran against other branches). @aanm does this sound reasonable to you?

One of the benefits here in particular would be fixing up search for v1.6 branch.

@aanm
Copy link
Member

aanm commented Sep 3, 2020

v1.6 cert expiry issue still.

Looking at the changes being made here, I think I'm happy to accept these backports in without CI since CI is unlikely to catch anything here (+ these already ran against other branches). @aanm does this sound reasonable to you?

One of the benefits here in particular would be fixing up search for v1.6 branch.

@joestringer LGTM

@joestringer joestringer merged commit 3d4469a into v1.6 Sep 3, 2020
@joestringer joestringer deleted the pr/v1.6-backport-2020-09-02 branch September 3, 2020 21:37
@joestringer joestringer mentioned this pull request Sep 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sayboras sayboras sayboras approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@christarazi @joestringer @aanm @sayboras @Neelajacques @genbit @UnwashedMeme