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.

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

Cilium standalone continuation #7646

Merged
merged 4 commits into from
Sep 26, 2019
Merged

Cilium standalone continuation #7646

merged 4 commits into from
Sep 26, 2019

Conversation

olemarkus
Copy link
Member

Fixes a couple of smaller issues left unresolved in #7474

Upgrades from Kops 1.13 stable to this PR works as expected.

Note that because bpffs is not mounted on the host before #7474, upgrading cilium will freeze the network on nodes where a cilium pod is being rolled.

Fixes #7575
Fixes #7046
Fixes #6496

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 21, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @olemarkus. Thanks for your PR.

I'm waiting for a kubernetes 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.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 21, 2019
Ole Markus With added 4 commits September 21, 2019 14:23
Fix Cilium addon version
55ffbf0 
Addon manager seems to fail at parsing the version because it only had
major.minor version.
Add networking label to all cilium resources
10f40d5
Disable wait-for-bpf
28584a5 
The addon is applied automatically, while bpf is mounted on nodeup. So updating cilium will
make cilium hang until the nodes are rolled. There is no need for this flag to be true
since bpf will anyways be available after roll.
Update hashes for cilium tests
3b62347
@chrisz100
Copy link
Contributor

/ok-to-test

If we happen to have to revert the changes of the last PR for this I don’t think we should merge this. If we don’t on the other hand... :-)
/assign @mikesplain

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 21, 2019
chrisz100
chrisz100 approved these changes Sep 21, 2019
View reviewed changes
Copy link
Contributor

@chrisz100 chrisz100 left a comment

Choose a reason for hiding this comment

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

Code wise this looks good for me!

@chrisz100
Copy link
Contributor

/lgtm
/hold
/area networking

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 21, 2019
@k8s-ci-robot k8s-ci-robot added area/networking lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Sep 21, 2019
@olemarkus
Copy link
Member Author

Makes sense to me. Could also just revert the previous one and push in all the changes in here. Makes cherry picking and such easier too, I guess.

@justinsb
Copy link
Member

Thanks @olemarkus

/approve
/lgtm

We can probably just cherry-pick both of them - that way all the rest of the machinery will work (e.g. relnotes)

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, olemarkus

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 26, 2019
@justinsb
Copy link
Member

Not sure if there was any particular reason for the hold @chrisz100 ? I'd suggest we get this in to master as it sounds like without it our current cilium configuration has some challenges.

@chrisz100
Copy link
Contributor

I know @mikesplain had some concerns regarding the related PR and considered reverting it. But I don’t mind getting it merged.

@mikesplain
Copy link
Contributor

I'm fine with this now. Thanks for clearing things up gang!

/lgtm
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 26, 2019
@k8s-ci-robot k8s-ci-robot merged commit 2fef10f into kubernetes:master Sep 26, 2019
@olemarkus olemarkus mentioned this pull request Oct 1, 2019
Merged
k8s-ci-robot added a commit that referenced this pull request Oct 1, 2019
@k8s-ci-robot
Merge pull request #7718 from olemarkus/automated-cherry-pick-of-#764…
7cb2639 
…6-origin-release-1.15

Automated cherry pick of #7646: Fix Cilium addon version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrisz100 chrisz100 chrisz100 approved these changes

@nebril nebril nebril approved these changes

@granular-ryanbonham granular-ryanbonham Awaiting requested review from granular-ryanbonham

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@justinsb justinsb

@chrisz100 chrisz100

@mikesplain mikesplain

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/networking cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
6 participants
@olemarkus @k8s-ci-robot @chrisz100 @justinsb @mikesplain @nebril