From f9d4a0a34d6686a6f3e620897f6040bc6612d188 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Sat, 4 Jul 2015 17:54:34 -0500 Subject: [PATCH] Convert contrib/ from --flag_name= to --flag-name= All binaries in kubenretes show `-` for help and seem to expect `-`. Although `_` also works. The inconsistencies across the codebase using - and _ result in difficultly using things like grep to find things that need to be changed. --- contrib/ansible/roles/kubernetes/files/make-ca-cert.sh | 2 +- contrib/ansible/roles/kubernetes/templates/config.j2 | 2 +- contrib/ansible/roles/master/templates/apiserver.j2 | 8 ++++---- .../ansible/roles/master/templates/controller-manager.j2 | 2 +- contrib/ansible/roles/node/templates/kubelet.j2 | 6 +++--- contrib/init/systemd/environ/apiserver | 6 +++--- contrib/init/systemd/environ/config | 2 +- contrib/init/systemd/environ/kubelet | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/contrib/ansible/roles/kubernetes/files/make-ca-cert.sh b/contrib/ansible/roles/kubernetes/files/make-ca-cert.sh index fec89bd7fac..81df11e15be 100755 --- a/contrib/ansible/roles/kubernetes/files/make-ca-cert.sh +++ b/contrib/ansible/roles/kubernetes/files/make-ca-cert.sh @@ -21,7 +21,7 @@ set -o pipefail # Caller should set in the ev: # MASTER_IP - this may be an ip or things like "_use_gce_external_ip_" # MASTER_NAME - DNS name for the master -# DNS_DOMAIN - which will be passed to minions in --cluster_domain +# DNS_DOMAIN - which will be passed to minions in --cluster-domain # SERVICE_CLUSTER_IP_RANGE - where all service IPs are allocated # Also the following will be respected diff --git a/contrib/ansible/roles/kubernetes/templates/config.j2 b/contrib/ansible/roles/kubernetes/templates/config.j2 index cf83970267e..aadc92979f8 100644 --- a/contrib/ansible/roles/kubernetes/templates/config.j2 +++ b/contrib/ansible/roles/kubernetes/templates/config.j2 @@ -17,7 +17,7 @@ KUBE_LOGTOSTDERR="--logtostderr=true" KUBE_LOG_LEVEL="--v=0" # Should this cluster be allowed to run privileged docker containers -KUBE_ALLOW_PRIV="--allow_privileged=true" +KUBE_ALLOW_PRIV="--allow-privileged=true" # How the replication controller, scheduler, and proxy KUBE_MASTER="--master=https://{{ groups['masters'][0] }}:{{ kube_master_api_port }}" diff --git a/contrib/ansible/roles/master/templates/apiserver.j2 b/contrib/ansible/roles/master/templates/apiserver.j2 index eb42ef09427..aff516ca150 100644 --- a/contrib/ansible/roles/master/templates/apiserver.j2 +++ b/contrib/ansible/roles/master/templates/apiserver.j2 @@ -11,16 +11,16 @@ KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1" KUBE_API_PORT="--secure-port={{ kube_master_api_port }}" # Port nodes listen on -# KUBELET_PORT="--kubelet_port=10250" +# KUBELET_PORT="--kubelet-port=10250" # Address range to use for services KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range={{ kube_service_addresses }}" # Location of the etcd cluster -KUBE_ETCD_SERVERS="--etcd_servers={% for node in groups['etcd'] %}http://{{ node }}:2379{% if not loop.last %},{% endif %}{% endfor %}" +KUBE_ETCD_SERVERS="--etcd-servers={% for node in groups['etcd'] %}http://{{ node }}:2379{% if not loop.last %},{% endif %}{% endfor %}" # default admission control policies -KUBE_ADMISSION_CONTROL="--admission_control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" +KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" # Add your own! -KUBE_API_ARGS="--tls_cert_file={{ kube_cert_dir }}/server.crt --tls_private_key_file={{ kube_cert_dir }}/server.key --client_ca_file={{ kube_cert_dir }}/ca.crt --token_auth_file={{ kube_token_dir }}/known_tokens.csv --service_account_key_file={{ kube_cert_dir }}/server.crt" +KUBE_API_ARGS="--tls-cert-file={{ kube_cert_dir }}/server.crt --tls-private-key-file={{ kube_cert_dir }}/server.key --client-ca-file={{ kube_cert_dir }}/ca.crt --token-auth-file={{ kube_token_dir }}/known_tokens.csv --service-account-key-file={{ kube_cert_dir }}/server.crt" diff --git a/contrib/ansible/roles/master/templates/controller-manager.j2 b/contrib/ansible/roles/master/templates/controller-manager.j2 index 389a60fa0e3..0dde136fbd5 100644 --- a/contrib/ansible/roles/master/templates/controller-manager.j2 +++ b/contrib/ansible/roles/master/templates/controller-manager.j2 @@ -4,4 +4,4 @@ # defaults from config and apiserver should be adequate # Add your own! -KUBE_CONTROLLER_MANAGER_ARGS="--kubeconfig={{ kube_config_dir }}/controller-manager.kubeconfig --service_account_private_key_file={{ kube_cert_dir }}/server.key --root_ca_file={{ kube_cert_dir }}/ca.crt" +KUBE_CONTROLLER_MANAGER_ARGS="--kubeconfig={{ kube_config_dir }}/controller-manager.kubeconfig --service-account-private-key-file={{ kube_cert_dir }}/server.key --root-ca-file={{ kube_cert_dir }}/ca.crt" diff --git a/contrib/ansible/roles/node/templates/kubelet.j2 b/contrib/ansible/roles/node/templates/kubelet.j2 index 3e9029f6839..283b3e514c2 100644 --- a/contrib/ansible/roles/node/templates/kubelet.j2 +++ b/contrib/ansible/roles/node/templates/kubelet.j2 @@ -8,14 +8,14 @@ KUBELET_ADDRESS="--address=0.0.0.0" # KUBELET_PORT="--port=10250" # You may leave this blank to use the actual hostname -KUBELET_HOSTNAME="--hostname_override={{ inventory_hostname }}" +KUBELET_HOSTNAME="--hostname-override={{ inventory_hostname }}" # location of the api-server -KUBELET_API_SERVER="--api_servers=https://{{ groups['masters'][0] }}:{{ kube_master_api_port }}" +KUBELET_API_SERVER="--api-servers=https://{{ groups['masters'][0] }}:{{ kube_master_api_port }}" # Add your own! {% if dns_setup %} -KUBELET_ARGS="--cluster_dns={{ dns_server }} --cluster_domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}" +KUBELET_ARGS="--cluster-dns={{ dns_server }} --cluster-domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}" {% else %} KUBELET_ARGS="--kubeconfig={{ kube_config_dir }}/kubelet.kubeconfig --config={{ kube_manifest_dir }}" {% endif %} diff --git a/contrib/init/systemd/environ/apiserver b/contrib/init/systemd/environ/apiserver index 3a2da7d1aff..223b99203c7 100644 --- a/contrib/init/systemd/environ/apiserver +++ b/contrib/init/systemd/environ/apiserver @@ -11,16 +11,16 @@ KUBE_API_ADDRESS="--insecure-bind-address=127.0.0.1" # KUBE_API_PORT="--port=8080" # Port minions listen on -# KUBELET_PORT="--kubelet_port=10250" +# KUBELET_PORT="--kubelet-port=10250" # Comma separated list of nodes in the etcd cluster -KUBE_ETCD_SERVERS="--etcd_servers=http://127.0.0.1:4001" +KUBE_ETCD_SERVERS="--etcd-servers=http://127.0.0.1:4001" # Address range to use for services KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=10.254.0.0/16" # default admission control policies -KUBE_ADMISSION_CONTROL="--admission_control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" +KUBE_ADMISSION_CONTROL="--admission-control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota" # Add your own! KUBE_API_ARGS="" diff --git a/contrib/init/systemd/environ/config b/contrib/init/systemd/environ/config index b90a756a531..8c0a28493fd 100644 --- a/contrib/init/systemd/environ/config +++ b/contrib/init/systemd/environ/config @@ -16,7 +16,7 @@ KUBE_LOGTOSTDERR="--logtostderr=true" KUBE_LOG_LEVEL="--v=0" # Should this cluster be allowed to run privileged docker containers -KUBE_ALLOW_PRIV="--allow_privileged=false" +KUBE_ALLOW_PRIV="--allow-privileged=false" # How the controller-manager, scheduler, and proxy find the apiserver KUBE_MASTER="--master=http://127.0.0.1:8080" diff --git a/contrib/init/systemd/environ/kubelet b/contrib/init/systemd/environ/kubelet index 64a7b25c454..db93a5eeb42 100644 --- a/contrib/init/systemd/environ/kubelet +++ b/contrib/init/systemd/environ/kubelet @@ -8,10 +8,10 @@ KUBELET_ADDRESS="--address=127.0.0.1" # KUBELET_PORT="--port=10250" # You may leave this blank to use the actual hostname -KUBELET_HOSTNAME="--hostname_override=127.0.0.1" +KUBELET_HOSTNAME="--hostname-override=127.0.0.1" # location of the api-server -KUBELET_API_SERVER="--api_servers=http://127.0.0.1:8080" +KUBELET_API_SERVER="--api-servers=http://127.0.0.1:8080" # Add your own! KUBELET_ARGS=""