From 18d26b38f87d6516f705876f809712ba342fa01f Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 4 Aug 2015 18:46:41 -0400 Subject: [PATCH] Converts examples/ from --flag_name= to --flag-name= --- high-availability/etc_kubernetes_kubelet | 10 +++++----- high-availability/kube-apiserver.manifest | 2 +- high-availability/kube-controller-manager.manifest | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/high-availability/etc_kubernetes_kubelet b/high-availability/etc_kubernetes_kubelet index 6c963f41..26d32a2a 100644 --- a/high-availability/etc_kubernetes_kubelet +++ b/high-availability/etc_kubernetes_kubelet @@ -9,13 +9,13 @@ KUBELET_ADDRESS="" # KUBELET_PORT="--port=10250" # You may leave this blank to use the actual hostname -# KUBELET_HOSTNAME="--hostname_override=0.0.0." +# KUBELET_HOSTNAME="--hostname-override=0.0.0." # location of the api-server -KUBELET_API_SERVER="--api_servers=http://0.0.0.0:8080,kube1.ha:8080,kube0.ha:8080 " -# --cert-dir="/var/run/kubernetes": The directory where the TLS certs are located (by default /var/run/kubernetes). If --tls_cert_file and --tls_private_key_file are provided, this flag will be ignored. -# --tls-cert-file="": File containing x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If --tls_cert_file and --tls_private_key_file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory passed to --cert_dir. -# --tls-private-key-file="": File containing x509 private key matching --tls_cert_file. +KUBELET_API_SERVER="--api-servers=http://0.0.0.0:8080,kube1.ha:8080,kube0.ha:8080 " +# --cert-dir="/var/run/kubernetes": The directory where the TLS certs are located (by default /var/run/kubernetes). If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored. +# --tls-cert-file="": File containing x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert). If --tls-cert-file and --tls-private-key-file are not provided, a self-signed certificate and key are generated for the public address and saved to the directory passed to --cert-dir. +# --tls-private-key-file="": File containing x509 private key matching --tls-cert-file. # We modify kubelet args to do verbose logs + read from manifests dir. KUBELET_ARGS="--tls-cert-file=/vagrant/apiserver.crt --tls-private-key-file=/vagrant/apiserver.key --register-node=true --v=5 --config=/etc/kubernetes/manifests --kubeconfig=/vagrant/kubeconfig" diff --git a/high-availability/kube-apiserver.manifest b/high-availability/kube-apiserver.manifest index 99f0f6f7..2e9488c3 100644 --- a/high-availability/kube-apiserver.manifest +++ b/high-availability/kube-apiserver.manifest @@ -14,7 +14,7 @@ "command": [ "/bin/sh", "-c", - "/usr/local/bin/kube-apiserver --address=0.0.0.0 --etcd_servers=http://kube0.ha:2379 --service-cluster-ip-range=10.0.0.0/16 --v=4 --allow_privileged=True 1>>/var/log/kube-apiserver.log 2>&1" + "/usr/local/bin/kube-apiserver --address=0.0.0.0 --etcd-servers=http://kube0.ha:2379 --service-cluster-ip-range=10.0.0.0/16 --v=4 --allow-privileged=True 1>>/var/log/kube-apiserver.log 2>&1" ], "livenessProbe": { "httpGet": { diff --git a/high-availability/kube-controller-manager.manifest b/high-availability/kube-controller-manager.manifest index 4d358da5..209c8821 100644 --- a/high-availability/kube-controller-manager.manifest +++ b/high-availability/kube-controller-manager.manifest @@ -14,7 +14,7 @@ "command": [ "/bin/sh", "-c", - "/usr/local/bin/kube-controller-manager --master=192.168.4.102:8080 --service_account_private_key_file=/srv/kubernetes/server.key --v=4 1>>/var/log/kube-controller-manager.log 2>&1" + "/usr/local/bin/kube-controller-manager --master=192.168.4.102:8080 --service-account-private-key-file=/srv/kubernetes/server.key --v=4 1>>/var/log/kube-controller-manager.log 2>&1" ], "livenessProbe": { "httpGet": {