Skip to content
This repository has been archived by the owner on Sep 24, 2021. It is now read-only.

Add support for more network plugins, e.g. flannel and calico #196

Merged
merged 3 commits into from
Aug 10, 2017

Conversation

feiskyer
Copy link
Contributor

@feiskyer feiskyer commented Aug 9, 2017

This PR makes CNI supports old-versioned plugins. And also adds support for more network plugins, e.g. flannel and calico

Closes: #69 #150

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 9, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@feiskyer
Copy link
Contributor Author

feiskyer commented Aug 9, 2017

cc/ @resouer

Copy link
Contributor

@resouer resouer left a comment

Choose a reason for hiding this comment

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

some nits, others lgtm


## [Flannel](https://github.com/coreos/flannel)

Remove othe cni network configure if they are already configured:
Copy link
Contributor

Choose a reason for hiding this comment

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

typo: other

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ack


## [Calico](https://www.projectcalico.org)

Remove othe cni network configure if they are already configured:
Copy link
Contributor

Choose a reason for hiding this comment

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

typo: other

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ack

Then setup calico plugin by running:

```sh
kubectl apply -f https://docs.projectcalico.org/v2.4/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

Is thiskubeadm/1.6/ implying we should we use k8s 1.6?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, it origins from calico's documentation, and supports kubernetes v1.6+

Copy link
Contributor

@resouer resouer left a comment

Choose a reason for hiding this comment

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

lgtm

@resouer resouer merged commit 69fef7e into kubernetes-retired:master Aug 10, 2017
@feiskyer feiskyer deleted the net branch August 10, 2017 03:12
@feiskyer feiskyer mentioned this pull request Sep 27, 2017
3 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants