github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use salt pillars to pass test arguments during cluster creation.

Browse Source
This commit is contained in:
gmarek
2015-05-26 10:43:48 +02:00
parent b0d31fb794
commit 5bb7eec5ab
8 changed files with 99 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,11 @@
{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + 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
{% if pillar['controller_manager_test_args'] is defined -%}
{% set params = params + " " + pillar['controller_manager_test_args'] -%}
{% endif -%}
{
"apiVersion": "v1",
"kind": "Pod",