Skip to content

v1.9 backports 2021-07-15 (2) #16910

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 1 commit into from
Jul 19, 2021
Merged

v1.9 backports 2021-07-15 (2) #16910

merged 1 commit into from
Jul 19, 2021

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Jul 15, 2021 •
edited
Loading

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

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

EDIT: Dropped first two PRs to ship the fix with the next release. Will follow up on CI to check whether the vagrant change impacts branch stability.

@joestringer joestringer requested a review from a team as a code owner July 15, 2021 23:14
@joestringer joestringer added backport/1.9 kind/backports This PR provides functionality previously merged into master. labels Jul 15, 2021
@joestringer joestringer requested review from pchaigno and twpayne July 15, 2021 23:14
@aditighag
Copy link
Member

Improve logging when cgroupfs mount fails #15999 -- Improve logging when cgroupfs mount fails (johngv2)

Lgtm, thanks! Let's include this in the upcoming 1.9 release.

@joestringer
Copy link
Member Author

test-me-please

@joestringer joestringer force-pushed the pr/v1.9-backport-2021-07-15-2 branch from 4a541de to 6ccf6c1 Compare July 16, 2021 01:50
@joestringer
Copy link
Member Author

test-backport-1.9

pchaigno
pchaigno approved these changes Jul 16, 2021
View reviewed changes
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

My PR looks good 👍

@joestringer joestringer mentioned this pull request Jul 16, 2021
Merged
@joestringer
Copy link
Member Author

CI triage:

These do not represent regressions so fine to merge.

@pchaigno
Copy link
Member

K8s-Upstream test looks completely broken:

Are you sure this is not a regression? The only other time I saw this was when @twpayne first tried to backport #16589. I'm surprised #16589 would make k8s-upstream fail but not our 4.19 CI job, but maybe @twpayne was right.

@pchaigno
Copy link
Member

pchaigno commented Jul 16, 2021 •
edited
Loading

19:11:37 mkdir: cannot create directory '/home/vagrant/go/src/k8s.io': Permission denied

Oh, it could be that this directory is only accessed in the k8s-upstream test. We've had some changes in VM image permissions recently...

EDIT: cilium/packer-ci-build#262

@aanm
Copy link
Member

aanm commented Jul 16, 2021

@pchaigno I don't think we need to block 1.9.9 with this PR, what do you think?

@pchaigno
Copy link
Member

pchaigno commented Jul 16, 2021 •
edited
Loading

@pchaigno I don't think we need to block 1.9.9 with this PR, what do you think?

The Union for v1.9.9 political party agrees. There's only CI and misc changes here.

@joestringer
cgroups: Fix improper error on return
3ee7661 
[ upstream commit e3f9c61 ]

[ Backporter's notes: handle rename pkg/cgroups/cgroups{,_linux}.go ]

If cgroupv2 is not mounted, a logical mistake returns a error
even after a successful mount, which is silently ignored by
the caller function.

This commit fixes the logical mistake and takes care of print a warning
message if the cgroupv2 could not be mounted.

Fixes: cilium#15997

Signed-off-by: Joao Victorino <joao@accuknox.com>
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer force-pushed the pr/v1.9-backport-2021-07-15-2 branch from 6ccf6c1 to 3ee7661 Compare July 19, 2021 02:29
@joestringer
Copy link
Member Author

test-backport-1.9

@joestringer joestringer mentioned this pull request Jul 19, 2021
Closed
@joestringer
Copy link
Member Author

CI triage:

@joestringer joestringer merged commit 92be5a0 into cilium:v1.9 Jul 19, 2021
@joestringer joestringer deleted the pr/v1.9-backport-2021-07-15-2 branch July 19, 2021 19:34
@joestringer joestringer mentioned this pull request Jul 19, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pchaigno pchaigno pchaigno approved these changes

@twpayne twpayne Awaiting requested review from twpayne

Assignees

@twpayne twpayne

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.
5 participants
@joestringer @aditighag @pchaigno @aanm @twpayne