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

Merge pull request #31103 from mwielgus/scheduling-alg-provider-flag

Browse Source 
Automatic merge from submit-queue

Scheduling algorithm provider flag in kube-up.sh

Follow up of:

#30274 #30992

cc: @piosz @wojtek-t @davidopp
This commit is contained in:
Kubernetes Submit Queue
2016-08-23 01:44:54 -07:00
committed by GitHub
parent 4edc98260f 11fabd7176
commit 6e75fa9745
8 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hack/verify-flags/exceptions.txt
View File

@@ -50,7 +50,7 @@ cluster/saltbase/salt/kube-proxy/kube-proxy.manifest: {% set api_servers_with_p
cluster/saltbase/salt/kube-proxy/kube-proxy.manifest: {% set api_servers_with_port = api_servers -%}
cluster/saltbase/salt/kube-proxy/kube-proxy.manifest: {% set cluster_cidr=" --cluster-cidr=" + pillar['cluster_cidr'] %}
cluster/saltbase/salt/kube-proxy/kube-proxy.manifest:{% set params = log_level + " " + feature_gates + " " + test_args -%}
cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest:{% set params = params + log_level + " " + feature_gates -%}
cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest:{% set params = params + log_level + " " + feature_gates + " " + scheduling_algorithm_provider -%}
cluster/saltbase/salt/kubelet/default: {% set api_servers_with_port = api_servers + ":6443" -%}
cluster/saltbase/salt/kubelet/default: {% set api_servers_with_port = api_servers -%}
cluster/saltbase/salt/kubelet/default: {% set enable_custom_metrics="--enable-custom-metrics=" + pillar['enable_custom_metrics'] %}
@@ -84,10 +84,6 @@ federation/config.default.json: "cluster_name": "cluster3-kubernetes",
federation/config.default.json: "num_nodes": 3,
federation/config.default.json: "num_nodes": 3,
federation/config.default.json: "num_nodes": 3,
hack/fed-up-cluster.sh: advertise_address="--advertise_address=${API_HOST}"
hack/fed-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}"
hack/fed-up-cluster.sh: advertise_address=""
hack/fed-up-cluster.sh: runtime_config=""
hack/local-up-cluster.sh: advertise_address="--advertise_address=${API_HOST}"
hack/local-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}"
hack/local-up-cluster.sh: advertise_address=""