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

add default flannel configuration for cni #28673

Merged
merged 1 commit into from
Jul 13, 2016
Merged

add default flannel configuration for cni #28673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions cluster/images/hyperkube/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz /
# Copy the cni folder into /opt/
COPY cni /opt/cni

# Copy overlay configuration to default directory
COPY cni-conf /etc/cni/net.d

# Create symlinks for each hyperkube server
# TODO: this is unreliable for now (e.g. running "/kubelet" panics)
# Also, it doesn't work for other architectures
Expand Down
9 changes: 9 additions & 0 deletions cluster/images/hyperkube/cni-conf/10-containernet.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "containernet",
"type": "flannel",
"delegate": {
"bridge": "cni0",
Copy link
Member

Choose a reason for hiding this comment

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

why not cbr0 for container bridge?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If I remember correctly the name cbr0 bridge is used now by kubenet plugin. In my understanding there are expectations attached to cbr0 bridge. I thought it it is better to keep separate to avoid confusion, e.g. there are command line options that mention the name CBR0.

"mtu": 1450,
"isDefaultGateway": true
}
}
3 changes: 3 additions & 0 deletions cluster/images/hyperkube/cni-conf/99-loopback.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "loopback"
}