github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4577 from satnam6502/cluster-name

Browse Source 
Qualify the name of forwarding rules with INSTANCE_PREFIX
This commit is contained in:
Eric Tune
2015-02-26 13:17:49 -08:00
parent 7665b2668f 19b927ea57
commit e77745672c
14 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/saltbase/salt/kube-apiserver/default
View File

@@ -10,6 +10,10 @@
{% set address = "--address=127.0.0.1" -%}
{% if pillar['instance_prefix'] is defined -%}
{% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%}
{% endif -%}
{% set publicAddressOverride = "" -%}
{% if grains.publicAddressOverride is defined -%}
{% set publicAddressOverride = "--public_address_override=" + grains.publicAddressOverride -%}
@@ -61,4 +65,4 @@
{% set runtime_config = "--runtime_config=" + grains.runtime_config -%}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{ cloud_config }} {{ runtime_config }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{ cloud_config }} {{ runtime_config }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cluster_name}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"