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

convert cluster/ from --flag_name= --flag-name=

Browse Source
This commit is contained in:
Eric Paris
2015-07-04 18:19:37 -05:00
parent cfc9312b7f
commit 86ca88be61
13 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/aws/coreos/node.yaml
View File

@@ -65,12 +65,12 @@ coreos:
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests
ExecStartPre=/run/setup-auth.sh ExecStartPre=/run/setup-auth.sh
ExecStart=/opt/kubernetes/server/bin/kubelet \ ExecStart=/opt/kubernetes/server/bin/kubelet \
--api_servers=https://${MASTER_IP} \ --api-servers=https://${MASTER_IP} \
--config=/etc/kubernetes/manifests \ --config=/etc/kubernetes/manifests \
--allow_privileged=False \ --allow-privileged=False \
--v=2 \ --v=2 \
--cluster_dns=10.0.0.10 \ --cluster-dns=10.0.0.10 \
--cluster_domain=${DNS_DOMAIN} \ --cluster-domain=${DNS_DOMAIN} \
--logtostderr=true \ --logtostderr=true \
--hostname-override=${HOSTNAME_OVERRIDE} \ --hostname-override=${HOSTNAME_OVERRIDE} \
--container-runtime=${KUBERNETES_CONTAINER_RUNTIME} --container-runtime=${KUBERNETES_CONTAINER_RUNTIME}

8
cluster/gce/coreos/node.yaml
View File

@@ -142,12 +142,12 @@ coreos:
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests
ExecStartPre=/run/setup-auth.sh ExecStartPre=/run/setup-auth.sh
ExecStart=/opt/kubernetes/server/bin/kubelet \ ExecStart=/opt/kubernetes/server/bin/kubelet \
--api_servers=https://${KUBERNETES_MASTER_NAME}.c.${PROJECT_ID}.internal \ --api-servers=https://${KUBERNETES_MASTER_NAME}.c.${PROJECT_ID}.internal \
--config=/etc/kubernetes/manifests \ --config=/etc/kubernetes/manifests \
--allow_privileged=False \ --allow-privileged=False \
--v=2 \ --v=2 \
--cluster_dns=10.0.0.10 \ --cluster-dns=10.0.0.10 \
--cluster_domain=cluster.local \ --cluster-domain=cluster.local \
--logtostderr=true \ --logtostderr=true \
--container-runtime=${KUBERNETES_CONTAINER_RUNTIME} --container-runtime=${KUBERNETES_CONTAINER_RUNTIME}
Restart=always Restart=always

4
cluster/images/hyperkube/master-multi.json
View File

@@ -23,8 +23,8 @@
"apiserver", "apiserver",
"--portal-net=10.0.0.1/24", "--portal-net=10.0.0.1/24",
"--address=0.0.0.0", "--address=0.0.0.0",
"--etcd_servers=http://127.0.0.1:4001", "--etcd-servers=http://127.0.0.1:4001",
"--cluster_name=kubernetes", "--cluster-name=kubernetes",
"--v=2" "--v=2"
] ]
}, },

4
cluster/images/hyperkube/master.json
View File

@@ -23,8 +23,8 @@
"apiserver", "apiserver",
"--portal-net=10.0.0.1/24", "--portal-net=10.0.0.1/24",
"--address=127.0.0.1", "--address=127.0.0.1",
"--etcd_servers=http://127.0.0.1:4001", "--etcd-servers=http://127.0.0.1:4001",
"--cluster_name=kubernetes", "--cluster-name=kubernetes",
"--v=2" "--v=2"
] ]
}, },

2
cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
View File

@@ -9,7 +9,7 @@ kill timeout 30 # wait 30s between SIGTERM and SIGKILL.
exec /usr/local/bin/apiserver \ exec /usr/local/bin/apiserver \
--address=%(api_bind_address)s \ --address=%(api_bind_address)s \
--etcd_servers=%(etcd_servers)s \ --etcd-servers=%(etcd_servers)s \
--logtostderr=true \ --logtostderr=true \
--service-cluster-ip-range=10.244.240.0/20 --service-cluster-ip-range=10.244.240.0/20

6
cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl
View File

@@ -9,7 +9,7 @@ kill timeout 60 # wait 60s between SIGTERM and SIGKILL.
exec /usr/local/bin/kubelet \ exec /usr/local/bin/kubelet \
--address=%(kubelet_bind_addr)s \ --address=%(kubelet_bind_addr)s \
--api_servers=%(kubeapi_server)s \ --api-servers=%(kubeapi_server)s \
--hostname_override=%(kubelet_bind_addr)s \ --hostname-override=%(kubelet_bind_addr)s \
--cadvisor_port=4193 \ --cadvisor-port=4193 \
--logtostderr=true --logtostderr=true

4
cluster/libvirt-coreos/user_data_master.yml
View File

@@ -16,8 +16,8 @@ coreos:
ExecStart=/opt/kubernetes/bin/kube-apiserver \ ExecStart=/opt/kubernetes/bin/kube-apiserver \
--address=0.0.0.0 \ --address=0.0.0.0 \
--port=8080 \ --port=8080 \
--etcd_servers=http://127.0.0.1:4001 \ --etcd-servers=http://127.0.0.1:4001 \
--kubelet_port=10250 \ --kubelet-port=10250 \
--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE} --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}
Restart=always Restart=always
RestartSec=2 RestartSec=2

8
cluster/libvirt-coreos/user_data_minion.yml
View File

@@ -15,10 +15,10 @@ coreos:
[Service] [Service]
ExecStart=/opt/kubernetes/bin/kubelet \ ExecStart=/opt/kubernetes/bin/kubelet \
--address=0.0.0.0 \ --address=0.0.0.0 \
--hostname_override=${MINION_IPS[$i]} \ --hostname-override=${MINION_IPS[$i]} \
--api_servers=http://${MASTER_IP}:8080 \ --api-servers=http://${MASTER_IP}:8080 \
$( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster_dns=${DNS_SERVER_IP}" ) \ $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster-dns=${DNS_SERVER_IP}" ) \
$( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster_domain=${DNS_DOMAIN}" ) \ $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster-domain=${DNS_DOMAIN}" ) \
--config=/opt/kubernetes/manifests --config=/opt/kubernetes/manifests
Restart=always Restart=always
RestartSec=2 RestartSec=2

10
cluster/rackspace/cloud-config/master-cloud-config.yaml
View File

@@ -87,9 +87,9 @@ coreos:
ExecStartPre=/usr/bin/mkdir -p /var/lib/kube-apiserver ExecStartPre=/usr/bin/mkdir -p /var/lib/kube-apiserver
ExecStart=/opt/bin/kube-apiserver \ ExecStart=/opt/bin/kube-apiserver \
--address=127.0.0.1 \ --address=127.0.0.1 \
--cloud_provider=rackspace \ --cloud-provider=rackspace \
--cloud_config=/etc/cloud.conf \ --cloud-config=/etc/cloud.conf \
--etcd_servers=http://127.0.0.1:4001 \ --etcd-servers=http://127.0.0.1:4001 \
--logtostderr=true \ --logtostderr=true \
--port=8080 \ --port=8080 \
--service-cluster-ip-range=SERVICE_CLUSTER_IP_RANGE \ --service-cluster-ip-range=SERVICE_CLUSTER_IP_RANGE \
@@ -122,8 +122,8 @@ coreos:
[Service] [Service]
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-controller-manager /opt/bin/kube-controller-manager ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-controller-manager /opt/bin/kube-controller-manager
ExecStart=/opt/bin/kube-controller-manager \ ExecStart=/opt/bin/kube-controller-manager \
--cloud_provider=rackspace \ --cloud-provider=rackspace \
--cloud_config=/etc/cloud.conf \ --cloud-config=/etc/cloud.conf \
--logtostderr=true \ --logtostderr=true \
--master=127.0.0.1:8080 \ --master=127.0.0.1:8080 \
--v=2 --v=2

10
cluster/rackspace/cloud-config/minion-cloud-config.yaml
View File

@@ -150,11 +150,11 @@ coreos:
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kubelet /opt/bin/kubelet ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kubelet /opt/bin/kubelet
ExecStart=/opt/bin/kubelet \ ExecStart=/opt/bin/kubelet \
--address=$private_ipv4 \ --address=$private_ipv4 \
--api_servers=${FIRST_APISERVER_URL} \ --api-servers=${FIRST_APISERVER_URL} \
--cluster_dns=DNS_SERVER_IP \ --cluster-dns=DNS_SERVER_IP \
--cluster_domain=DNS_DOMAIN \ --cluster-domain=DNS_DOMAIN \
--healthz-bind-address=$private_ipv4 \ --healthz-bind-address=$private_ipv4 \
--hostname_override=$private_ipv4 \ --hostname-override=$private_ipv4 \
--logtostderr=true \ --logtostderr=true \
--v=2 --v=2
Restart=always Restart=always
@@ -176,7 +176,7 @@ coreos:
ExecStartPre=/run/config-kube-proxy.sh ExecStartPre=/run/config-kube-proxy.sh
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-proxy /opt/bin/kube-proxy ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-proxy /opt/bin/kube-proxy
ExecStart=/opt/bin/kube-proxy \ ExecStart=/opt/bin/kube-proxy \
--bind_address=$private_ipv4 \ --bind-address=$private_ipv4 \
--kubeconfig=/var/lib/kube-proxy/kubeconfig \ --kubeconfig=/var/lib/kube-proxy/kubeconfig \
--logtostderr=true \ --logtostderr=true \
--master=${FIRST_APISERVER_URL} --master=${FIRST_APISERVER_URL}

28
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

@@ -9,10 +9,10 @@
{% set cloud_config_volume = "" -%} {% set cloud_config_volume = "" -%}
{% if grains.cloud is defined -%} {% if grains.cloud is defined -%}
{% set cloud_provider = "--cloud_provider=" + grains.cloud -%} {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
{% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%} {% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}
{% set cloud_config = "--cloud_config=" + grains.cloud_config -%} {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
{% set cloud_config_mount = "{\"name\": \"cloudconfigmount\",\"mountPath\": \"" + grains.cloud_config + "\", \"readOnly\": true}," -%} {% set cloud_config_mount = "{\"name\": \"cloudconfigmount\",\"mountPath\": \"" + grains.cloud_config + "\", \"readOnly\": true}," -%}
{% set cloud_config_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\"}}," -%} {% set cloud_config_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\"}}," -%}
{% endif -%} {% endif -%}
@@ -35,7 +35,7 @@
{% set cluster_name = "" -%} {% set cluster_name = "" -%}
{% if pillar['instance_prefix'] is defined -%} {% if pillar['instance_prefix'] is defined -%}
{% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%} {% set cluster_name = "--cluster-name=" + pillar['instance_prefix'] -%}
{% endif -%} {% endif -%}
{% set bind_address = "" -%} {% set bind_address = "" -%}
@@ -43,24 +43,24 @@
{% set bind_address = "--bind-address=" + grains.publicAddressOverride -%} {% set bind_address = "--bind-address=" + grains.publicAddressOverride -%}
{% endif -%} {% endif -%}
{% set etcd_servers = "--etcd_servers=http://127.0.0.1:4001" -%} {% set etcd_servers = "--etcd-servers=http://127.0.0.1:4001" -%}
{% set service_cluster_ip_range = "" -%} {% set service_cluster_ip_range = "" -%}
{% if pillar['service_cluster_ip_range'] is defined -%} {% if pillar['service_cluster_ip_range'] is defined -%}
{% set service_cluster_ip_range = "--service-cluster-ip-range=" + pillar['service_cluster_ip_range'] -%} {% set service_cluster_ip_range = "--service-cluster-ip-range=" + pillar['service_cluster_ip_range'] -%}
{% endif -%} {% endif -%}
{% set cert_file = "--tls_cert_file=/srv/kubernetes/server.cert" -%} {% set cert_file = "--tls-cert-file=/srv/kubernetes/server.cert" -%}
{% set key_file = "--tls_private_key_file=/srv/kubernetes/server.key" -%} {% set key_file = "--tls-private-key-file=/srv/kubernetes/server.key" -%}
{% set client_ca_file = "" -%} {% set client_ca_file = "" -%}
{% set secure_port = "6443" -%} {% set secure_port = "6443" -%}
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant' ] %} {% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant' ] %}
{% set secure_port = "443" -%} {% set secure_port = "443" -%}
{% set client_ca_file = "--client_ca_file=/srv/kubernetes/ca.crt" -%} {% set client_ca_file = "--client-ca-file=/srv/kubernetes/ca.crt" -%}
{% endif -%} {% endif -%}
{% set token_auth_file = "--token_auth_file=/dev/null" -%} {% set token_auth_file = "--token-auth-file=/dev/null" -%}
{% set basic_auth_file = "" -%} {% set basic_auth_file = "" -%}
{% set min_request_timeout = "" -%} {% set min_request_timeout = "" -%}
@@ -70,26 +70,26 @@
{% if grains.cloud is defined -%} {% if grains.cloud is defined -%}
{% if grains.cloud in [ 'aws', 'gce', 'vagrant' ] -%} {% if grains.cloud in [ 'aws', 'gce', 'vagrant' ] -%}
{% set token_auth_file = "--token_auth_file=/srv/kubernetes/known_tokens.csv" -%} {% set token_auth_file = "--token-auth-file=/srv/kubernetes/known_tokens.csv" -%}
{% endif -%} {% endif -%}
{% endif -%} {% endif -%}
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant'] %} {% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant'] %}
{% set basic_auth_file = "--basic_auth_file=/srv/kubernetes/basic_auth.csv" -%} {% set basic_auth_file = "--basic-auth-file=/srv/kubernetes/basic_auth.csv" -%}
{% endif -%} {% endif -%}
{% set admission_control = "" -%} {% set admission_control = "" -%}
{% if pillar['admission_control'] is defined -%} {% if pillar['admission_control'] is defined -%}
{% set admission_control = "--admission_control=" + pillar['admission_control'] -%} {% set admission_control = "--admission-control=" + pillar['admission_control'] -%}
{% endif -%} {% endif -%}
{% set runtime_config = "" -%} {% set runtime_config = "" -%}
{% if grains.runtime_config is defined -%} {% if grains.runtime_config is defined -%}
{% set runtime_config = "--runtime_config=" + grains.runtime_config -%} {% set runtime_config = "--runtime-config=" + grains.runtime_config -%}
{% endif -%} {% endif -%}
{% set params = address + " " + etcd_servers + " " + cloud_provider + " " + cloud_config + " " + runtime_config + " " + admission_control + " " + service_cluster_ip_range + " " + client_ca_file + " " + basic_auth_file + " " + min_request_timeout -%} {% set params = address + " " + etcd_servers + " " + cloud_provider + " " + cloud_config + " " + runtime_config + " " + admission_control + " " + service_cluster_ip_range + " " + client_ca_file + " " + basic_auth_file + " " + min_request_timeout -%}
{% set params = params + " " + cluster_name + " " + cert_file + " " + key_file + " --secure_port=" + secure_port + " " + token_auth_file + " " + bind_address + " " + pillar['log_level'] + " " + advertise_address + " " + proxy_ssh_options -%} {% set params = params + " " + cluster_name + " " + cert_file + " " + key_file + " --secure-port=" + secure_port + " " + token_auth_file + " " + bind_address + " " + pillar['log_level'] + " " + advertise_address + " " + proxy_ssh_options -%}
# test_args has to be kept at the end, so they'll overwrite any prior configuration # test_args has to be kept at the end, so they'll overwrite any prior configuration
{% if pillar['apiserver_test_args'] is defined -%} {% if pillar['apiserver_test_args'] is defined -%}
@@ -117,7 +117,7 @@
"command": [ "command": [
"/bin/sh", "/bin/sh",
"-c", "-c",
"/usr/local/bin/kube-apiserver {{params}} --allow_privileged={{pillar['allow_privileged']}} 1>>/var/log/kube-apiserver.log 2>&1" "/usr/local/bin/kube-apiserver {{params}} --allow-privileged={{pillar['allow_privileged']}} 1>>/var/log/kube-apiserver.log 2>&1"
], ],
"livenessProbe": { "livenessProbe": {
"httpGet": { "httpGet": {

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

@@ -3,7 +3,7 @@
{% set allocate_node_cidrs = "" -%} {% set allocate_node_cidrs = "" -%}
{% if pillar['instance_prefix'] is defined -%} {% if pillar['instance_prefix'] is defined -%}
{% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%} {% set cluster_name = "--cluster-name=" + pillar['instance_prefix'] -%}
{% endif -%} {% endif -%}
{% if pillar['cluster_cidr'] is defined and pillar['cluster_cidr'] != "" -%} {% if pillar['cluster_cidr'] is defined and pillar['cluster_cidr'] != "" -%}
{% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%} {% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%}
@@ -18,11 +18,11 @@
{% set cloud_config_volume = "" -%} {% set cloud_config_volume = "" -%}
{% if grains.cloud is defined -%} {% if grains.cloud is defined -%}
{% set cloud_provider = "--cloud_provider=" + grains.cloud -%} {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
{% set service_account_key = " --service_account_private_key_file=/srv/kubernetes/server.key " -%} {% set service_account_key = " --service-account-private-key-file=/srv/kubernetes/server.key " -%}
{% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%} {% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}
{% set cloud_config = "--cloud_config=" + grains.cloud_config -%} {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
{% set cloud_config_mount = "{\"name\": \"cloudconfigmount\",\"mountPath\": \"" + grains.cloud_config + "\", \"readOnly\": true}," -%} {% set cloud_config_mount = "{\"name\": \"cloudconfigmount\",\"mountPath\": \"" + grains.cloud_config + "\", \"readOnly\": true}," -%}
{% set cloud_config_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\"}}," -%} {% set cloud_config_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\"}}," -%}
{% endif -%} {% endif -%}
@@ -31,7 +31,7 @@
{% set root_ca_file = "" -%} {% set root_ca_file = "" -%}
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant' ] %} {% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant' ] %}
{% set root_ca_file = "--root_ca_file=/srv/kubernetes/ca.crt" -%} {% set root_ca_file = "--root-ca-file=/srv/kubernetes/ca.crt" -%}
{% endif -%} {% endif -%}
{% 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 -%} {% 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 -%}

26
cluster/saltbase/salt/kubelet/default
View File

@@ -4,15 +4,15 @@
{% endif -%} {% endif -%}
{% if grains.api_servers is defined -%} {% if grains.api_servers is defined -%}
{% set api_servers = "--api_servers=https://" + grains.api_servers -%} {% set api_servers = "--api-servers=https://" + grains.api_servers -%}
{% elif grains.apiservers is defined -%} # TODO(remove after 0.16.0): Deprecated form {% elif grains.apiservers is defined -%} # TODO(remove after 0.16.0): Deprecated form
{% set api_servers = "--api_servers=https://" + grains.apiservers -%} {% set api_servers = "--api-servers=https://" + grains.apiservers -%}
{% elif grains['roles'][0] == 'kubernetes-master' -%} {% elif grains['roles'][0] == 'kubernetes-master' -%}
{% set master_ipv4 = salt['grains.get']('fqdn_ip4')[0] -%} {% set master_ipv4 = salt['grains.get']('fqdn_ip4')[0] -%}
{% set api_servers = "--api_servers=https://" + master_ipv4 -%} {% set api_servers = "--api-servers=https://" + master_ipv4 -%}
{% else -%} {% else -%}
{% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%} {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
{% set api_servers = "--api_servers=https://" + ips[0][0] -%} {% set api_servers = "--api-servers=https://" + ips[0][0] -%}
{% endif -%} {% endif -%}
# TODO: remove nginx for other cloud providers. # TODO: remove nginx for other cloud providers.
@@ -44,7 +44,7 @@
{% set cloud_provider = "" -%} {% set cloud_provider = "" -%}
{% if grains.cloud is defined -%} {% if grains.cloud is defined -%}
{% set cloud_provider = "--cloud_provider=" + grains.cloud -%} {% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
{% endif -%} {% endif -%}
{% set config = "--config=/etc/kubernetes/manifests" -%} {% set config = "--config=/etc/kubernetes/manifests" -%}
@@ -56,24 +56,24 @@
{% set hostname_override = "" -%} {% set hostname_override = "" -%}
{% if grains.hostname_override is defined -%} {% if grains.hostname_override is defined -%}
{% set hostname_override = " --hostname_override=" + grains.hostname_override -%} {% set hostname_override = " --hostname-override=" + grains.hostname_override -%}
{% endif -%} {% endif -%}
{% set cluster_dns = "" %} {% set cluster_dns = "" %}
{% set cluster_domain = "" %} {% set cluster_domain = "" %}
{% if pillar.get('enable_cluster_dns', '').lower() == 'true' %} {% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
{% set cluster_dns = "--cluster_dns=" + pillar['dns_server'] %} {% set cluster_dns = "--cluster-dns=" + pillar['dns_server'] %}
{% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %} {% set cluster_domain = "--cluster-domain=" + pillar['dns_domain'] %}
{% endif %} {% endif %}
{% set docker_root = "" -%} {% set docker_root = "" -%}
{% if grains.docker_root is defined -%} {% if grains.docker_root is defined -%}
{% set docker_root = " --docker_root=" + grains.docker_root -%} {% set docker_root = " --docker-root=" + grains.docker_root -%}
{% endif -%} {% endif -%}
{% set kubelet_root = "" -%} {% set kubelet_root = "" -%}
{% if grains.kubelet_root is defined -%} {% if grains.kubelet_root is defined -%}
{% set kubelet_root = " --root_dir=" + grains.kubelet_root -%} {% set kubelet_root = " --root-dir=" + grains.kubelet_root -%}
{% endif -%} {% endif -%}
{% set configure_cbr0 = "" -%} {% set configure_cbr0 = "" -%}
@@ -86,10 +86,10 @@
{% set cgroup_root = "" -%} {% set cgroup_root = "" -%}
{% if grains['os_family'] == 'Debian' -%} {% if grains['os_family'] == 'Debian' -%}
{% set system_container = "--system-container=/system" -%} {% set system_container = "--system-container=/system" -%}
{% set cgroup_root = "--cgroup_root=/" -%} {% set cgroup_root = "--cgroup-root=/" -%}
{% endif -%} {% endif -%}
{% if grains['oscodename'] == 'vivid' -%} {% if grains['oscodename'] == 'vivid' -%}
{% set cgroup_root = "--cgroup_root=docker" -%} {% set cgroup_root = "--cgroup-root=docker" -%}
{% endif -%} {% endif -%}
{% set pod_cidr = "" %} {% set pod_cidr = "" %}
@@ -103,4 +103,4 @@
{% endif -%} {% endif -%}
# test_args has to be kept at the end, so they'll overwrite any prior configuration # test_args has to be kept at the end, so they'll overwrite any prior configuration
DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{test_args}}" DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{test_args}}"