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

Use /opt/cni/bin on all distros (including COS) #7833

Merged
merged 1 commit into from
Jan 13, 2020
Merged

Use /opt/cni/bin on all distros (including COS) #7833

merged 1 commit into from
Jan 13, 2020

Conversation

justinsb
Copy link
Member

Rather than remapping the cni-bin to /home/kubernetes/bin, which then
requires us to change the CNI manifests also to write to the new
location, we can instead bind mount /opt/cni/bin so that it is
writeable.

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 28, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 28, 2019
@justinsb justinsb added this to the 1.17 milestone Nov 6, 2019
@justinsb
Copy link
Member Author

justinsb commented Jan 5, 2020

I'm planning on updating this after #8269

@hakman hakman mentioned this pull request Jan 5, 2020
Merged
@justinsb
Use /opt/cni/bin on all distros
a0c16c9 
We used to remap the cni-bin to /home/kubernetes/bin on COS, but that
then requires us to change the CNI manifests also to write to the new
location.

Instead we can use /opt/cni/bin on all distros, now that we are making
it writeable everywhere with a bind mount.
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 11, 2020
@justinsb justinsb changed the title WIP: COS: Make /opt/cni/bin work Use /opt/cni/bin on all distros (including COS) Jan 11, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 11, 2020
@rifelpet
Copy link
Member

/retest

@rifelpet
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 13, 2020
@rifelpet
Copy link
Member

/test pull-kops-bazel-test

@k8s-ci-robot k8s-ci-robot merged commit c129752 into kubernetes:master Jan 13, 2020
@k8s-ci-robot k8s-ci-robot modified the milestones: v1.17, v1.18 Jan 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet Awaiting requested review from rifelpet

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@rifelpet rifelpet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@justinsb @k8s-ci-robot @rifelpet