Fix up for posix flags

cluster/saltbase/pillar/logging.sls

@@ -1 +1 @@
-log_level: "-v=2"
+log_level: "--v=2"

cluster/saltbase/salt/kube-apiserver/default

@@ -5,50 +5,50 @@
 
 {% set cloud_provider = "" -%}
 {% if grains.cloud_provider is defined -%}
-  {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider -%}
+  {% set cloud_provider = "--cloud_provider=" + grains.cloud_provider -%}
 {% endif -%}
 
-{% set address = "-address=127.0.0.1" -%}
+{% set address = "--address=127.0.0.1" -%}
 
 {% set publicAddressOverride = "" -%}
 {% if grains.publicAddressOverride is defined -%}
-  {% set publicAddressOverride = "-public_address_override=" + grains.publicAddressOverride -%}
+  {% set publicAddressOverride = "--public_address_override=" + grains.publicAddressOverride -%}
 {% endif -%}
 
 
 {% if grains.etcd_servers is defined -%}
-  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
+  {% set etcd_servers = "--etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
 {% else -%}
   {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
-  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
+  {% set etcd_servers = "--etcd_servers=http://" + ips[0][0] + ":4001" -%}
 {% endif -%}
 
 {% if grains.cloud is defined -%}
 {% if grains.cloud == 'gce' -%}
-  {% set cloud_provider = "-cloud_provider=gce" -%}
+  {% set cloud_provider = "--cloud_provider=gce" -%}
 {% endif -%}
 {% endif -%}
 
 {% if pillar['portal_net'] is defined -%}
-  {% set portal_net = "-portal_net=" + pillar['portal_net'] -%}
+  {% set portal_net = "--portal_net=" + pillar['portal_net'] -%}
 {% 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 secure_port = "-secure_port=6443" -%}
-{% set token_auth_file = "-token_auth_file=/dev/null" -%}
+{% set secure_port = "--secure_port=6443" -%}
+{% set token_auth_file = "--token_auth_file=/dev/null" -%}
 
 {% if grains.cloud is defined -%}
 {% if grains.cloud == 'gce' or grains.cloud == 'vagrant' -%}
     # TODO: generate and distribute tokens for other cloud providers.
-    {% 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 -%}
 
 {% set admission_control = "" -%}
 {% if grains.admission_control is defined -%}
- {% set admission_control = "-admission_control=" + grains.admission_control -%}
+ {% set admission_control = "--admission_control=" + grains.admission_control -%}
 {% endif -%}
 
 DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"

cluster/saltbase/salt/kube-controller-manager/default

@@ -4,33 +4,33 @@
 	{% set daemon_args = "" -%}
 {% endif -%}
 
-{% set master="-master=127.0.0.1:8080" -%}
+{% set master="--master=127.0.0.1:8080" -%}
 
 {% set machines = ""-%}
 {% set cloud_provider = "" -%}
-{% set minion_regexp = "-minion_regexp=.*" -%}
+{% set minion_regexp = "--minion_regexp=.*" -%}
 {% if grains.cloud_provider is defined -%}
-  {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider -%}
+  {% set cloud_provider = "--cloud_provider=" + grains.cloud_provider -%}
 {% endif -%}
 
 {% if pillar['node_instance_prefix'] is defined -%}
-  {% set minion_regexp = "-minion_regexp='" + pillar['node_instance_prefix'] + ".*'" -%}
+  {% set minion_regexp = "--minion_regexp='" + pillar['node_instance_prefix'] + ".*'" -%}
 {% endif -%}
 
 {% if grains.cloud is defined -%}
 {% if grains.cloud == 'gce' -%}
-  {% set cloud_provider = "-cloud_provider=gce" -%}
-  {% set machines = "-machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
+  {% set cloud_provider = "--cloud_provider=gce" -%}
+  {% set machines = "--machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
 {% endif -%}
 {% if grains.cloud == 'aws' -%}
-  {% set cloud_provider = "-cloud_provider=aws" -%}
-  {% set cloud_config = "-cloud_config=/etc/aws.conf" -%}
+  {% set cloud_provider = "--cloud_provider=aws" -%}
+  {% set cloud_config = "--cloud_config=/etc/aws.conf" -%}
   {% set minion_regexp = "" -%}
-  {% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
+  {% set machines = "--machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
 {% endif -%}
 {% if grains.cloud == 'azure' -%}
   MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}"
-  {% set machines = "-machines=$MACHINES" -%}
+  {% set machines = "--machines=$MACHINES" -%}
 {% endif -%}
 {% if grains.cloud == 'vsphere' -%}
   # Collect IPs of minions as machines list.
@@ -42,7 +42,7 @@
   {% for addrs in salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').values() -%}
   MACHINE_IPS+=( {{ addrs[0] }} )
   {% endfor -%}
-  {% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" -%}
+  {% set machines = "--machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" -%}
   {% set minion_regexp = "" -%}
 {% endif -%}
 {% endif -%}

cluster/saltbase/salt/kube-proxy/default

@@ -3,10 +3,10 @@
 	{% set daemon_args = "" -%}
 {% endif -%}
 {% if grains.api_servers is defined -%}
-  {% set api_servers = "-master=http://" + grains.api_servers + ":7080" -%}
+  {% set api_servers = "--master=http://" + grains.api_servers + ":7080" -%}
 {% else -%}
   {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
-  {% set api_servers = "-master=http://" + ips[0][0] + ":7080" -%}
+  {% set api_servers = "--master=http://" + ips[0][0] + ":7080" -%}
 {% endif -%}
 
 DAEMON_ARGS="{{daemon_args}} {{api_servers}} {{pillar['log_level']}}"

cluster/saltbase/salt/kube-scheduler/default

@@ -2,6 +2,6 @@
 {% if grains['os_family'] == 'RedHat' -%}
 	{% set daemon_args = "" -%}
 {% endif -%}
-{% set master="-master=127.0.0.1:8080" -%}
+{% set master="--master=127.0.0.1:8080" -%}
 
 DAEMON_ARGS="{{daemon_args}} {{master}} {{pillar['log_level']}}"

cluster/saltbase/salt/kubelet/default

@@ -3,35 +3,35 @@
   {% set daemon_args = "" -%}
 {% endif -%}
 {% if grains.etcd_servers is defined -%}
-  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
+  {% set etcd_servers = "--etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
 {% else -%}
   {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
-  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
+  {% set etcd_servers = "--etcd_servers=http://" + ips[0][0] + ":4001" -%}
 {% endif -%}
 
 {% if grains.apiservers is defined -%}
-  {% set apiservers = "-api_servers=https://" + grains.apiservers + ":6443" -%}
+  {% set apiservers = "--api_servers=https://" + grains.apiservers + ":6443" -%}
 {% else -%}
   {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
-  {% set apiservers = "-api_servers=https://" + ips[0][0] + ":6443" -%}
+  {% set apiservers = "--api_servers=https://" + ips[0][0] + ":6443" -%}
 {% endif -%}
 
-{% set address = "-address=0.0.0.0" -%}
-{% set config = "-config=/etc/kubernetes/manifests" -%}
+{% set address = "--address=0.0.0.0" -%}
+{% set config = "--config=/etc/kubernetes/manifests" -%}
 {% set hostname_override = "" -%}
 {% if grains.minion_ip is defined -%}
-  {% set hostname_override = " -hostname_override=" + grains.minion_ip -%}
+  {% set hostname_override = " --hostname_override=" + grains.minion_ip -%}
 {% endif -%}
 
-{% set auth_path = "-auth_path=/var/lib/kubelet/kubernetes_auth" -%}
+{% set auth_path = "--auth_path=/var/lib/kubelet/kubernetes_auth" -%}
 
-{% set registry_qps = "-registry_qps=0.1" %}
+{% set registry_qps = "--registry_qps=0.1" %}
 
 {% set cluster_dns = "" %}
 {% set cluster_domain = "" %}
 {% if pillar['enable_cluster_dns'] is defined and pillar['enable_cluster_dns'] %}
-  {% 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 %}
 
 DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}}"

contrib/recipes/docs/apiserver_hipache_registration.md

@@ -24,9 +24,9 @@ First, create your kube-apiserver.service file (change necessary variables)
     ExecStartPre=/usr/bin/wget -P /opt/bin https://path/to/kube-apiserver/binary
     ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
     ExecStart=/opt/bin/kube-apiserver \
-    -address=0.0.0.0 \
-    -port=8080 \
-    -etcd_servers=http://10.1.10.10:4001
+    --address=0.0.0.0 \
+    --port=8080 \
+    --etcd_servers=http://10.1.10.10:4001
     ExecStartPost=/usr/bin/etcdctl -C 10.1.10.10:4001 set /frontend:172.20.1.20 '[ "kubernetes", "http://${DEFAULT_IPV4}:8080" ]'
     Restart=always
     RestartSec=10

docs/man/kube-apiserver.1.md

@@ -14,64 +14,64 @@ The **kubernetes** API server validates and configures data for 3 types of objec
 The the kube-apiserver several options.
 
 # OPTIONS
-**-address**=""
+**--address**=""
 	The address on the local server to listen to. Default 127.0.0.1
 
-**-allow_privileged**=""
+**--allow_privileged**=""
 	If true, allow privileged containers.
 
-**-alsologtostderr**=
+**--alsologtostderr**=
 	log to standard error as well as files. Default is false.
 
-**-api_prefix**="/api"
+**--api_prefix**="/api"
 	The prefix for API requests on the server. Default '/api'
 
-**-cloud_config**=""
+**--cloud_config**=""
 	The path to the cloud provider configuration file. Empty string for no configuration file.
 
-**-cloud_provider**=""
+**--cloud_provider**=""
 	The provider for cloud services. Empty string for no provider.
 
-**-cors_allowed_origins**=[]
+**--cors_allowed_origins**=[]
 	List of allowed origins for CORS, comma separated. An allowed origin can be a regular expression to support subdomain matching. If this list is empty CORS will not be enabled.
 
-**-etcd_servers**=[]
+**--etcd_servers**=[]
 	List of etcd servers to watch (http://ip:port), comma separated
 
-**-health_check_minions**=
+**--health_check_minions**=
 	If true, health check minions and filter unhealthy ones. Default true.
 
-**-log_backtrace_at=**:0
+**--log_backtrace_at=**:0
 	when logging hits line file:N, emit a stack trace
 
-**-log_dir**=""
+**--log_dir**=""
 	If non-empty, write log files in this directory
 
-**-log_flush_frequency**=5s
+**--log_flush_frequency**=5s
 	Maximum number of seconds between log flushes. Default is 5 seconds.
 
-**-logtostderr**=
+**--logtostderr**=
 	log to standard error instead of files. Default is false.
 
-**-kubelet_port**=10250
+**--kubelet_port**=10250
 	The port at which kubelet will be listening on the minions. Default is 10250.
 
-**-port**=8080
+**--port**=8080
 	The port to listen on. Default is 8080.
 
-**-stderrthreshold**=0
+**--stderrthreshold**=0
 	logs at or above this threshold go to stderr. Default is 0.
 
-**-storage_version**=""
+**--storage_version**=""
 	The version to store resources with. Defaults to server preferred.
 
-**-v**=0
+**--v**=0
 	Log level for V logs.
 
-**-version**=false
+**--version**=false
 	Print version information and quit. Default is false.
 
-**-vmodule**=
+**--vmodule**=
 	comma-separated list of pattern=N settings for file-filtered logging
 
 # EXAMPLES

docs/man/kube-controller-manager.1.md

@@ -14,64 +14,64 @@ The **kubernetes** controller manager is really a service that is layered on top
 The kube-controller-manager has several options.
 
 # OPTIONS
-**-address**=""
+**--address**=""
 	The address on the local server to listen to. Default 127.0.0.1.
 
-**-allow_privileged**="false"
+**--allow_privileged**="false"
 	If true, allow privileged containers.
 
-**-address=**"127.0.0.1"
+**--address=**"127.0.0.1"
 	The address to serve from.
 
-**-alsologtostderr**=false
+**--alsologtostderr**=false
 	log to standard error as well as files.
 
-**-api_version**=""
+**--api_version**=""
 	The API version to use when talking to the server.
 
-**-cloud_config**=""
+**--cloud_config**=""
 	The path to the cloud provider configuration file. Empty string for no configuration file.
 
-**-cloud_provider**=""
+**--cloud_provider**=""
 	The provider for cloud services. Empty string for no provider.
 
-**-minion_regexp**=""
+**--minion_regexp**=""
 	If non empty, and -cloud_provider is specified, a regular expression for matching minion VMs.
 
-**-insecure_skip_tls_verify**=false
+**--insecure_skip_tls_verify**=false
 	If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.
 
-**-log_backtrace_at**=:0
+**--log_backtrace_at**=:0
 	when logging hits line file:N, emit a stack trace.
 
-**-log_dir**=""
+**--log_dir**=""
 	If non-empty, write log files in this directory.
 
-**-log_flush_frequency**=5s
+**--log_flush_frequency**=5s
 	Maximum number of seconds between log flushes.
 
-**-logtostderr**=false
+**--logtostderr**=false
 	log to standard error instead of files.
 
-**-machines**=[]
+**--machines**=[]
         List of machines to schedule onto, comma separated.
 
-**-master**=""
+**--master**=""
 	The address of the Kubernetes API server.
 
-**-port**=10252
+**--port**=10252
 	The port that the controller-manager's http service runs on.
 
-**-stderrthreshold**=0
+**--stderrthreshold**=0
 	logs at or above this threshold go to stderr.
 
-**-v**=0
+**--v**=0
 	log level for V logs.
 
-**-version**=false
+**--version**=false
 	Print version information and quit.
 
-**-vmodule**=
+**--vmodule**=
 	comma-separated list of pattern=N settings for file-filtered logging.
 
 # EXAMPLES