epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-04 09:58:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3254 from mattymo/calico_upgrade_tweaks

Browse Source 
Fix backward compatibility with calico 2.6
This commit is contained in:
k8s-ci-robot
2018-09-06 06:20:52 -07:00
committed by GitHub
parent ab462d92b8 dc3e317d20
commit 2faa8f1e37
5 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/kubespray-defaults/defaults/main.yaml
View File

@@ -100,6 +100,9 @@ kube_network_plugin: calico
# Determines if calico-rr group exists
peer_with_calico_rr: "{{ 'calico-rr' in groups and groups['calico-rr']|length > 0 }}"
# Set to false to disable calico-upgrade
calico_upgrade_enabled: true
# Kubernetes internal network for services, unused block of space.
kube_service_addresses: 10.233.0.0/18