Skip to content

Conversation

@w9n
Copy link
Contributor

@w9n w9n commented Dec 14, 2017

- What I did
Minimize usage of /var binding in containers and simplify cni metadata path.
- How I did it
Let the cni config persist on /var/lib/cni/conf and /var/lib/cni/bin.
then mount share them to their default position in /etc/cni/net.d and /opt/cni/bin in docker, kubelet and hostroot (cri-containerd mounts weave pods HostPath here).
- How to verify it
I run both cluster types.
- Description for the changelog

plumb cni settings

- A picture of a cute animal (not mandatory but encouraged)

@w9n w9n force-pushed the cni_settings branch 5 times, most recently from f7cea80 to 9728407 Compare December 15, 2017 00:45
Copy link
Contributor

@ijc ijc left a comment

Choose a reason for hiding this comment

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

Mostly LGTM but clashes with your #27 that I've just merged, please rebase.

Also you need to update yml/bridge.yml with the new config path.

Would be best if you could rebase onto #33 since I'm about to rebase & (hopefully) merge that one too.

@ijc
Copy link
Contributor

ijc commented Dec 18, 2017

#33 is merged so rebase onto master should be sufficient.

w9n added 3 commits December 19, 2017 12:40
Signed-off-by: Robin Winkelewski <w9ncontact@gmail.com>
Signed-off-by: Robin Winkelewski <w9ncontact@gmail.com>
@GordonTheTurtle
Copy link
Collaborator

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "cni_settings" git@github.com:w9n/kubernetes.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354109296
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

Signed-off-by: Robin Winkelewski <w9ncontact@gmail.com>
@ijc ijc merged commit d39e6ba into linuxkit:master Dec 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants