From e4d0389b4adc85b71f2159057ee2d45bc3576ec7 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Sat, 4 Jul 2015 18:34:40 -0500 Subject: [PATCH] Converts docs/ from --flag_name= to --flag-name= --- docs/admin/high-availability/default-kubelet | 6 ++--- .../high-availability/kube-apiserver.yaml | 14 +++++------ .../kube-controller-manager.yaml | 4 ++-- ...kubernetes-cluster-main-nodes-template.yml | 8 +++---- .../azure/lib/deployment_logic/kubernetes.js | 2 +- .../coreos/cloud-configs/master.yaml | 24 +++++++++---------- .../coreos/cloud-configs/node.yaml | 12 +++++----- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/admin/high-availability/default-kubelet b/docs/admin/high-availability/default-kubelet index d581ec5e70d..41ee5301510 100644 --- a/docs/admin/high-availability/default-kubelet +++ b/docs/admin/high-availability/default-kubelet @@ -3,6 +3,6 @@ MASTER_IP= # This should be the internal service IP address reserved for DNS DNS_IP= -DAEMON_ARGS="$DAEMON_ARGS --api_servers=https://${MASTER_IP} --enable-debugging-handlers=true --cloud_provider= -gce --config=/etc/kubernetes/manifests --allow_privileged=False --v=2 --cluster_dns=${DNS_IP} --cluster_domain=c -luster.local --configure-cbr0=true --cgroup_root=/ --system-container=/system " \ No newline at end of file +DAEMON_ARGS="$DAEMON_ARGS --api-servers=https://${MASTER_IP} --enable-debugging-handlers=true --cloud-provider= +gce --config=/etc/kubernetes/manifests --allow-privileged=False --v=2 --cluster-dns=${DNS_IP} --cluster-domain=c +luster.local --configure-cbr0=true --cgroup-root=/ --system-container=/system " diff --git a/docs/admin/high-availability/kube-apiserver.yaml b/docs/admin/high-availability/kube-apiserver.yaml index 3bfe65f9620..f5081925aa3 100644 --- a/docs/admin/high-availability/kube-apiserver.yaml +++ b/docs/admin/high-availability/kube-apiserver.yaml @@ -10,13 +10,13 @@ spec: command: - /bin/sh - -c - - /usr/local/bin/kube-apiserver --address=127.0.0.1 --etcd_servers=http://127.0.0.1:4001 - --cloud_provider=gce --admission_control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota - --service-cluster-ip-range=10.0.0.0/16 --client_ca_file=/srv/kubernetes/ca.crt - --basic_auth_file=/srv/kubernetes/basic_auth.csv --cluster_name=e2e-test-bburns - --tls_cert_file=/srv/kubernetes/server.cert --tls_private_key_file=/srv/kubernetes/server.key - --secure_port=443 --token_auth_file=/srv/kubernetes/known_tokens.csv --v=2 - --allow_privileged=False 1>>/var/log/kube-apiserver.log 2>&1 + - /usr/local/bin/kube-apiserver --address=127.0.0.1 --etcd-servers=http://127.0.0.1:4001 + --cloud-provider=gce --admission-control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota + --service-cluster-ip-range=10.0.0.0/16 --client-ca-file=/srv/kubernetes/ca.crt + --basic-auth-file=/srv/kubernetes/basic_auth.csv --cluster-name=e2e-test-bburns + --tls-cert-file=/srv/kubernetes/server.cert --tls-private-key-file=/srv/kubernetes/server.key + --secure-port=443 --token-auth-file=/srv/kubernetes/known_tokens.csv --v=2 + --allow-privileged=False 1>>/var/log/kube-apiserver.log 2>&1 ports: - containerPort: 443 hostPort: 443 diff --git a/docs/admin/high-availability/kube-controller-manager.yaml b/docs/admin/high-availability/kube-controller-manager.yaml index 09acc340504..736181fc7c2 100644 --- a/docs/admin/high-availability/kube-controller-manager.yaml +++ b/docs/admin/high-availability/kube-controller-manager.yaml @@ -7,8 +7,8 @@ spec: - command: - /bin/sh - -c - - /usr/local/bin/kube-controller-manager --master=127.0.0.1:8080 --cluster_name=e2e-test-bburns - --cluster-cidr=10.245.0.0/16 --allocate-node-cidrs=true --cloud_provider=gce --service_account_private_key_file=/srv/kubernetes/server.key + - /usr/local/bin/kube-controller-manager --master=127.0.0.1:8080 --cluster-name=e2e-test-bburns + --cluster-cidr=10.245.0.0/16 --allocate-node-cidrs=true --cloud-provider=gce --service-account-private-key-file=/srv/kubernetes/server.key --v=2 1>>/var/log/kube-controller-manager.log 2>&1 image: gcr.io/google_containers/kube-controller-manager:fda24638d51a48baa13c35337fcd4793 livenessProbe: diff --git a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml index fcf2c6c573d..1e4305133a2 100644 --- a/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml +++ b/docs/getting-started-guides/coreos/azure/cloud_config_templates/kubernetes-cluster-main-nodes-template.yml @@ -288,11 +288,11 @@ coreos: ExecStart=/opt/kubernetes/server/bin/kubelet \ --address=0.0.0.0 \ --port=10250 \ - --hostname_override=%H \ - --api_servers=http://kube-00:8080 \ + --hostname-override=%H \ + --api-servers=http://kube-00:8080 \ --logtostderr=true \ - --cluster_dns=10.1.0.3 \ - --cluster_domain=kube.local \ + --cluster-dns=10.1.0.3 \ + --cluster-domain=kube.local \ --config=/etc/kubernetes/manifests/ Restart=always RestartSec=10 diff --git a/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js b/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js index dfeca7eb628..2002b43a53e 100644 --- a/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js +++ b/docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js @@ -38,7 +38,7 @@ etcd_initial_cluster_conf_kube = function (conf) { 'name': 'kube-apiserver.service', 'drop-ins': [{ 'name': '50-etcd-initial-cluster.conf', - 'content': _.template("[Service]\nEnvironment=ETCD_SERVERS=--etcd_servers=<%= nodes.join(',') %>\n")(data), + 'content': _.template("[Service]\nEnvironment=ETCD_SERVERS=--etcd-servers=<%= nodes.join(',') %>\n")(data), }], }; }; diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml index af4ee5c30ff..195d7b8773d 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/master.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/master.yaml @@ -87,18 +87,18 @@ coreos: ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver ExecStartPre=/opt/bin/wupiao 127.0.0.1:2379/v2/machines ExecStart=/opt/bin/kube-apiserver \ - --service_account_key_file=/opt/bin/kube-serviceaccount.key \ - --service_account_lookup=false \ - --admission_control=NamespaceLifecycle,NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota \ - --runtime_config=api/v1 \ - --allow_privileged=true \ - --insecure_bind_address=0.0.0.0 \ - --insecure_port=8080 \ - --kubelet_https=true \ - --secure_port=6443 \ + --service-account-key-file=/opt/bin/kube-serviceaccount.key \ + --service-account-lookup=false \ + --admission-control=NamespaceLifecycle,NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota \ + --runtime-config=api/v1 \ + --allow-privileged=true \ + --insecure-bind-address=0.0.0.0 \ + --insecure-port=8080 \ + --kubelet-https=true \ + --secure-port=6443 \ --service-cluster-ip-range=10.100.0.0/16 \ - --etcd_servers=http://127.0.0.1:2379 \ - --public_address_override=${DEFAULT_IPV4} \ + --etcd-servers=http://127.0.0.1:2379 \ + --public-address-override=${DEFAULT_IPV4} \ --logtostderr=true Restart=always RestartSec=10 @@ -115,7 +115,7 @@ coreos: ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-controller-manager -z /opt/bin/kube-controller-manager https://storage.googleapis.com/kubernetes-release/release/v1.0.1/bin/linux/amd64/kube-controller-manager ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager ExecStart=/opt/bin/kube-controller-manager \ - --service_account_private_key_file=/opt/bin/kube-serviceaccount.key \ + --service-account-private-key-file=/opt/bin/kube-serviceaccount.key \ --master=127.0.0.1:8080 \ --logtostderr=true Restart=always diff --git a/docs/getting-started-guides/coreos/cloud-configs/node.yaml b/docs/getting-started-guides/coreos/cloud-configs/node.yaml index 58a33812980..1b4dc2e48cd 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/node.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/node.yaml @@ -84,13 +84,13 @@ coreos: ExecStart=/opt/bin/kubelet \ --address=0.0.0.0 \ --port=10250 \ - --hostname_override=${DEFAULT_IPV4} \ - --api_servers=:8080 \ - --allow_privileged=true \ + --hostname-override=${DEFAULT_IPV4} \ + --api-servers=:8080 \ + --allow-privileged=true \ --logtostderr=true \ - --cadvisor_port=4194 \ - --healthz_bind_address=0.0.0.0 \ - --healthz_port=10248 + --cadvisor-port=4194 \ + --healthz-bind-address=0.0.0.0 \ + --healthz-port=10248 Restart=always RestartSec=10 update: