mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-21 13:10:19 -03:30
Initial version of Flannel using CNI (#1486)
* Updates Controller Manager/Kubelet with Flannel's required configuration for CNI * Removes old Flannel installation * Install CNI enabled Flannel DaemonSet/ConfigMap/CNI bins and config (with portmap plugin) on host * Uses RBAC if enabled * Fixed an issue that could occur if br_netfilter is not a module and net.bridge.bridge-nf-call-iptables sysctl was not set
This commit is contained in:
committed by
Matthew Mosesohn
parent
4550dccb84
commit
a39e78d42d
@@ -1,7 +1,8 @@
|
||||
---
|
||||
# Flannel public IP
|
||||
# The address that flannel should advertise as how to access the system
|
||||
flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address)) }}"
|
||||
# Disabled until https://github.com/coreos/flannel/issues/712 is fixed
|
||||
# flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address)) }}"
|
||||
|
||||
## interface that should be used for flannel operations
|
||||
## This is actually an inventory node-level item
|
||||
@@ -17,5 +18,5 @@ flannel_cpu_limit: 300m
|
||||
flannel_memory_requests: 64M
|
||||
flannel_cpu_requests: 150m
|
||||
|
||||
flannel_cert_dir: /etc/flannel/certs
|
||||
etcd_cert_dir: /etc/ssl/etcd/ssl
|
||||
# Legacy directory, will be removed if found.
|
||||
flannel_cert_dir: /etc/flannel/certs
|
||||
Reference in New Issue
Block a user