github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 16:06:51 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #31056

Browse Source
This commit is contained in:
Johannes Scheuermann
2016-08-20 12:02:19 +02:00
parent 3c65fdc752
commit f8d2b21327
2 changed files with 2 additions and 2 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

@@ -79,7 +79,7 @@
{% endif -%}
{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + service_cluster_ip_range + " " + terminated_pod_gc + " " + enable_garbage_collector + " " + cloud_provider + " " + cloud_config + " " + service_account_key + " " + log_level + " " + root_ca_file -%}
{% set params = params + " " feature_gates %}
{% set params = params + " " + feature_gates -%}
# test_args has to be kept at the end, so they'll overwrite any prior configuration