From 86ca88be617ad44bd783e3070f402bf10c48a617 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Sat, 4 Jul 2015 18:19:37 -0500 Subject: [PATCH] convert cluster/ from --flag_name= --flag-name= --- cluster/aws/coreos/node.yaml | 8 +++--- cluster/gce/coreos/node.yaml | 8 +++--- cluster/images/hyperkube/master-multi.json | 4 +-- cluster/images/hyperkube/master.json | 4 +-- .../files/apiserver.upstart.tmpl | 2 +- .../kubernetes/files/kubelet.upstart.tmpl | 6 ++-- cluster/libvirt-coreos/user_data_master.yml | 4 +-- cluster/libvirt-coreos/user_data_minion.yml | 8 +++--- .../cloud-config/master-cloud-config.yaml | 10 +++---- .../cloud-config/minion-cloud-config.yaml | 10 +++---- .../kube-apiserver/kube-apiserver.manifest | 28 +++++++++---------- .../kube-controller-manager.manifest | 10 +++---- cluster/saltbase/salt/kubelet/default | 26 ++++++++--------- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/cluster/aws/coreos/node.yaml b/cluster/aws/coreos/node.yaml index 286abdea1ac..c85aeda552c 100644 --- a/cluster/aws/coreos/node.yaml +++ b/cluster/aws/coreos/node.yaml @@ -65,12 +65,12 @@ coreos: ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/run/setup-auth.sh ExecStart=/opt/kubernetes/server/bin/kubelet \ - --api_servers=https://${MASTER_IP} \ + --api-servers=https://${MASTER_IP} \ --config=/etc/kubernetes/manifests \ - --allow_privileged=False \ + --allow-privileged=False \ --v=2 \ - --cluster_dns=10.0.0.10 \ - --cluster_domain=${DNS_DOMAIN} \ + --cluster-dns=10.0.0.10 \ + --cluster-domain=${DNS_DOMAIN} \ --logtostderr=true \ --hostname-override=${HOSTNAME_OVERRIDE} \ --container-runtime=${KUBERNETES_CONTAINER_RUNTIME} diff --git a/cluster/gce/coreos/node.yaml b/cluster/gce/coreos/node.yaml index 955f990d527..0ec352965d5 100644 --- a/cluster/gce/coreos/node.yaml +++ b/cluster/gce/coreos/node.yaml @@ -142,12 +142,12 @@ coreos: ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/run/setup-auth.sh 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 \ - --allow_privileged=False \ + --allow-privileged=False \ --v=2 \ - --cluster_dns=10.0.0.10 \ - --cluster_domain=cluster.local \ + --cluster-dns=10.0.0.10 \ + --cluster-domain=cluster.local \ --logtostderr=true \ --container-runtime=${KUBERNETES_CONTAINER_RUNTIME} Restart=always diff --git a/cluster/images/hyperkube/master-multi.json b/cluster/images/hyperkube/master-multi.json index a3c2ccff950..d6fb3574f6f 100644 --- a/cluster/images/hyperkube/master-multi.json +++ b/cluster/images/hyperkube/master-multi.json @@ -23,8 +23,8 @@ "apiserver", "--portal-net=10.0.0.1/24", "--address=0.0.0.0", - "--etcd_servers=http://127.0.0.1:4001", - "--cluster_name=kubernetes", + "--etcd-servers=http://127.0.0.1:4001", + "--cluster-name=kubernetes", "--v=2" ] }, diff --git a/cluster/images/hyperkube/master.json b/cluster/images/hyperkube/master.json index f1e39c9a72b..8b935d14951 100644 --- a/cluster/images/hyperkube/master.json +++ b/cluster/images/hyperkube/master.json @@ -23,8 +23,8 @@ "apiserver", "--portal-net=10.0.0.1/24", "--address=127.0.0.1", - "--etcd_servers=http://127.0.0.1:4001", - "--cluster_name=kubernetes", + "--etcd-servers=http://127.0.0.1:4001", + "--cluster-name=kubernetes", "--v=2" ] }, diff --git a/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl b/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl index 3f0109eb83a..28d9799978c 100644 --- a/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl +++ b/cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl @@ -9,7 +9,7 @@ kill timeout 30 # wait 30s between SIGTERM and SIGKILL. exec /usr/local/bin/apiserver \ --address=%(api_bind_address)s \ - --etcd_servers=%(etcd_servers)s \ + --etcd-servers=%(etcd_servers)s \ --logtostderr=true \ --service-cluster-ip-range=10.244.240.0/20 diff --git a/cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl b/cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl index 0aa6cb72349..5b8dc39d50f 100644 --- a/cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl +++ b/cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl @@ -9,7 +9,7 @@ kill timeout 60 # wait 60s between SIGTERM and SIGKILL. exec /usr/local/bin/kubelet \ --address=%(kubelet_bind_addr)s \ - --api_servers=%(kubeapi_server)s \ - --hostname_override=%(kubelet_bind_addr)s \ - --cadvisor_port=4193 \ + --api-servers=%(kubeapi_server)s \ + --hostname-override=%(kubelet_bind_addr)s \ + --cadvisor-port=4193 \ --logtostderr=true diff --git a/cluster/libvirt-coreos/user_data_master.yml b/cluster/libvirt-coreos/user_data_master.yml index 2e5f0764d4f..cd48387b278 100644 --- a/cluster/libvirt-coreos/user_data_master.yml +++ b/cluster/libvirt-coreos/user_data_master.yml @@ -16,8 +16,8 @@ coreos: ExecStart=/opt/kubernetes/bin/kube-apiserver \ --address=0.0.0.0 \ --port=8080 \ - --etcd_servers=http://127.0.0.1:4001 \ - --kubelet_port=10250 \ + --etcd-servers=http://127.0.0.1:4001 \ + --kubelet-port=10250 \ --service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE} Restart=always RestartSec=2 diff --git a/cluster/libvirt-coreos/user_data_minion.yml b/cluster/libvirt-coreos/user_data_minion.yml index 3a843415910..5c9c5c9d8fe 100644 --- a/cluster/libvirt-coreos/user_data_minion.yml +++ b/cluster/libvirt-coreos/user_data_minion.yml @@ -15,10 +15,10 @@ coreos: [Service] ExecStart=/opt/kubernetes/bin/kubelet \ --address=0.0.0.0 \ - --hostname_override=${MINION_IPS[$i]} \ - --api_servers=http://${MASTER_IP}:8080 \ - $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster_dns=${DNS_SERVER_IP}" ) \ - $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster_domain=${DNS_DOMAIN}" ) \ + --hostname-override=${MINION_IPS[$i]} \ + --api-servers=http://${MASTER_IP}:8080 \ + $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster-dns=${DNS_SERVER_IP}" ) \ + $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster-domain=${DNS_DOMAIN}" ) \ --config=/opt/kubernetes/manifests Restart=always RestartSec=2 diff --git a/cluster/rackspace/cloud-config/master-cloud-config.yaml b/cluster/rackspace/cloud-config/master-cloud-config.yaml index a55a132805c..7d9b0e8bf4d 100644 --- a/cluster/rackspace/cloud-config/master-cloud-config.yaml +++ b/cluster/rackspace/cloud-config/master-cloud-config.yaml @@ -87,9 +87,9 @@ coreos: ExecStartPre=/usr/bin/mkdir -p /var/lib/kube-apiserver ExecStart=/opt/bin/kube-apiserver \ --address=127.0.0.1 \ - --cloud_provider=rackspace \ - --cloud_config=/etc/cloud.conf \ - --etcd_servers=http://127.0.0.1:4001 \ + --cloud-provider=rackspace \ + --cloud-config=/etc/cloud.conf \ + --etcd-servers=http://127.0.0.1:4001 \ --logtostderr=true \ --port=8080 \ --service-cluster-ip-range=SERVICE_CLUSTER_IP_RANGE \ @@ -122,8 +122,8 @@ coreos: [Service] ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-controller-manager /opt/bin/kube-controller-manager ExecStart=/opt/bin/kube-controller-manager \ - --cloud_provider=rackspace \ - --cloud_config=/etc/cloud.conf \ + --cloud-provider=rackspace \ + --cloud-config=/etc/cloud.conf \ --logtostderr=true \ --master=127.0.0.1:8080 \ --v=2 diff --git a/cluster/rackspace/cloud-config/minion-cloud-config.yaml b/cluster/rackspace/cloud-config/minion-cloud-config.yaml index d1bab0db3f0..0f59551195b 100644 --- a/cluster/rackspace/cloud-config/minion-cloud-config.yaml +++ b/cluster/rackspace/cloud-config/minion-cloud-config.yaml @@ -150,11 +150,11 @@ coreos: ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kubelet /opt/bin/kubelet ExecStart=/opt/bin/kubelet \ --address=$private_ipv4 \ - --api_servers=${FIRST_APISERVER_URL} \ - --cluster_dns=DNS_SERVER_IP \ - --cluster_domain=DNS_DOMAIN \ + --api-servers=${FIRST_APISERVER_URL} \ + --cluster-dns=DNS_SERVER_IP \ + --cluster-domain=DNS_DOMAIN \ --healthz-bind-address=$private_ipv4 \ - --hostname_override=$private_ipv4 \ + --hostname-override=$private_ipv4 \ --logtostderr=true \ --v=2 Restart=always @@ -176,7 +176,7 @@ coreos: ExecStartPre=/run/config-kube-proxy.sh ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-proxy /opt/bin/kube-proxy ExecStart=/opt/bin/kube-proxy \ - --bind_address=$private_ipv4 \ + --bind-address=$private_ipv4 \ --kubeconfig=/var/lib/kube-proxy/kubeconfig \ --logtostderr=true \ --master=${FIRST_APISERVER_URL} diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest index 5f66068102a..0afab9c79c0 100644 --- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest +++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest @@ -9,10 +9,10 @@ {% set cloud_config_volume = "" -%} {% 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 -%} - {% 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_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\"}}," -%} {% endif -%} @@ -35,7 +35,7 @@ {% set cluster_name = "" -%} {% if pillar['instance_prefix'] is defined -%} - {% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%} + {% set cluster_name = "--cluster-name=" + pillar['instance_prefix'] -%} {% endif -%} {% set bind_address = "" -%} @@ -43,24 +43,24 @@ {% set bind_address = "--bind-address=" + grains.publicAddressOverride -%} {% 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 = "" -%} {% if pillar['service_cluster_ip_range'] is defined -%} {% set service_cluster_ip_range = "--service-cluster-ip-range=" + pillar['service_cluster_ip_range'] -%} {% endif -%} -{% set cert_file = "--tls_cert_file=/srv/kubernetes/server.cert" -%} -{% set key_file = "--tls_private_key_file=/srv/kubernetes/server.key" -%} +{% set cert_file = "--tls-cert-file=/srv/kubernetes/server.cert" -%} +{% set key_file = "--tls-private-key-file=/srv/kubernetes/server.key" -%} {% set client_ca_file = "" -%} {% set secure_port = "6443" -%} {% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant' ] %} {% 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 -%} -{% set token_auth_file = "--token_auth_file=/dev/null" -%} +{% set token_auth_file = "--token-auth-file=/dev/null" -%} {% set basic_auth_file = "" -%} {% set min_request_timeout = "" -%} @@ -70,26 +70,26 @@ {% if grains.cloud is defined -%} {% 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 -%} {% 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 -%} {% set admission_control = "" -%} {% if pillar['admission_control'] is defined -%} - {% set admission_control = "--admission_control=" + pillar['admission_control'] -%} + {% set admission_control = "--admission-control=" + pillar['admission_control'] -%} {% endif -%} {% set runtime_config = "" -%} {% if grains.runtime_config is defined -%} - {% set runtime_config = "--runtime_config=" + grains.runtime_config -%} + {% set runtime_config = "--runtime-config=" + grains.runtime_config -%} {% 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 = 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 {% if pillar['apiserver_test_args'] is defined -%} @@ -117,7 +117,7 @@ "command": [ "/bin/sh", "-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": { "httpGet": { diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest index 1725030fe06..7c0e214213a 100644 --- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest +++ b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest @@ -3,7 +3,7 @@ {% set allocate_node_cidrs = "" -%} {% if pillar['instance_prefix'] is defined -%} - {% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%} + {% set cluster_name = "--cluster-name=" + pillar['instance_prefix'] -%} {% endif -%} {% if pillar['cluster_cidr'] is defined and pillar['cluster_cidr'] != "" -%} {% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%} @@ -18,11 +18,11 @@ {% set cloud_config_volume = "" -%} {% if grains.cloud is defined -%} - {% set cloud_provider = "--cloud_provider=" + grains.cloud -%} - {% set service_account_key = " --service_account_private_key_file=/srv/kubernetes/server.key " -%} + {% set cloud_provider = "--cloud-provider=" + grains.cloud -%} + {% 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 -%} - {% 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_volume = "{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"" + grains.cloud_config + "\"}}," -%} {% endif -%} @@ -31,7 +31,7 @@ {% set root_ca_file = "" -%} {% 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 -%} {% 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 -%} diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 48fddbf8e5a..6a9dcdc7d21 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -4,15 +4,15 @@ {% endif -%} {% 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 - {% set api_servers = "--api_servers=https://" + grains.apiservers -%} + {% set api_servers = "--api-servers=https://" + grains.apiservers -%} {% elif grains['roles'][0] == 'kubernetes-master' -%} {% 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 -%} {% 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 -%} # TODO: remove nginx for other cloud providers. @@ -44,7 +44,7 @@ {% set cloud_provider = "" -%} {% if grains.cloud is defined -%} - {% set cloud_provider = "--cloud_provider=" + grains.cloud -%} + {% set cloud_provider = "--cloud-provider=" + grains.cloud -%} {% endif -%} {% set config = "--config=/etc/kubernetes/manifests" -%} @@ -56,24 +56,24 @@ {% set hostname_override = "" -%} {% if grains.hostname_override is defined -%} - {% set hostname_override = " --hostname_override=" + grains.hostname_override -%} + {% set hostname_override = " --hostname-override=" + grains.hostname_override -%} {% endif -%} {% set cluster_dns = "" %} {% set cluster_domain = "" %} {% if pillar.get('enable_cluster_dns', '').lower() == 'true' %} - {% set cluster_dns = "--cluster_dns=" + pillar['dns_server'] %} - {% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %} + {% set cluster_dns = "--cluster-dns=" + pillar['dns_server'] %} + {% set cluster_domain = "--cluster-domain=" + pillar['dns_domain'] %} {% endif %} {% set docker_root = "" -%} {% if grains.docker_root is defined -%} - {% set docker_root = " --docker_root=" + grains.docker_root -%} + {% set docker_root = " --docker-root=" + grains.docker_root -%} {% endif -%} {% set kubelet_root = "" -%} {% if grains.kubelet_root is defined -%} - {% set kubelet_root = " --root_dir=" + grains.kubelet_root -%} + {% set kubelet_root = " --root-dir=" + grains.kubelet_root -%} {% endif -%} {% set configure_cbr0 = "" -%} @@ -86,10 +86,10 @@ {% set cgroup_root = "" -%} {% if grains['os_family'] == 'Debian' -%} {% set system_container = "--system-container=/system" -%} - {% set cgroup_root = "--cgroup_root=/" -%} + {% set cgroup_root = "--cgroup-root=/" -%} {% endif -%} {% if grains['oscodename'] == 'vivid' -%} - {% set cgroup_root = "--cgroup_root=docker" -%} + {% set cgroup_root = "--cgroup-root=docker" -%} {% endif -%} {% set pod_cidr = "" %} @@ -103,4 +103,4 @@ {% endif -%} # 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}}"