Skip to content

K
k3s
Commit f9a45e69 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28673 from cheld/add-cni-config

Automatic merge from submit-queue add default flannel configuration for cni I added a default flannel configuration for cni. So hyperkube can be started with: ``` --network-plugin=kubenet ``` or with flannel: ``` --network-plugin=cni --network-plugin-dir=/etc/cni/net.d ``` Requires update of cni binaries to 0.3.0 or later to work. See also https://github.com/kubernetes/kubernetes/issues/27603 This PR is intended to support multi-node Hyperkube https://github.com/kubernetes/kube-deploy/pull/115 CC @zreigz [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
parents 721eabf4 d659c16e
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
cluster/images/hyperkube/Dockerfile
View file @ f9a45e69
...@@ -68,6 +68,9 @@ ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz / ...@@ -68,6 +68,9 @@ ADD https://storage.googleapis.com/kubernetes-release/easy-rsa/easy-rsa.tar.gz /
# Copy the cni folder into /opt/ # Copy the cni folder into /opt/
COPY cni /opt/cni COPY cni /opt/cni
# Copy overlay configuration to default directory
COPY cni-conf /etc/cni/net.d
# Create symlinks for each hyperkube server # Create symlinks for each hyperkube server
# TODO: this is unreliable for now (e.g. running "/kubelet" panics) # TODO: this is unreliable for now (e.g. running "/kubelet" panics)
# Also, it doesn't work for other architectures # Also, it doesn't work for other architectures
......
cluster/images/hyperkube/cni-conf/10-containernet.conf 0 → 100644
View file @ f9a45e69
{
"name": "containernet",
"type": "flannel",
"delegate": {
"bridge": "cni0",
"mtu": 1450,
"isDefaultGateway": true
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment