github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Flannel handshakes with kubelet.

Browse Source
This commit is contained in:
Prashanth Balasubramanian
2015-11-20 19:41:32 -08:00
committed by gmarek
parent 4cd1ee177b
commit 7aa8ebe30f
5 changed files with 197 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
View File

@@ -39,7 +39,7 @@
{% set root_ca_file = "--root-ca-file=/srv/kubernetes/ca.crt" -%}
{% endif -%}
{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + terminated_pod_gc + " " + cloud_provider + " " + cloud_config + service_account_key + pillar['log_level'] + " " + root_ca_file -%}
{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " --allocate-node-cidrs=false" + " " + terminated_pod_gc + " " + cloud_provider + " " + cloud_config + service_account_key + pillar['log_level'] + " " + root_ca_file -%}
# test_args has to be kept at the end, so they'll overwrite any prior configuration