github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 20:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3480 from jbeda/all_pflag

Browse Source 
Convert all main binaries to pflag library
This commit is contained in:
Joe Beda
2015-01-15 11:26:41 -08:00
parent 2dce916276 24e512b4b8
commit 224ffa4567
46 changed files with 335 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/pillar/logging.sls
View File

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

2
cluster/saltbase/salt/etcd/initd
View File

@@ -78,7 +78,7 @@ case "$1" in
do_start
case "$?" in
0|1) log_end_msg 0 || exit 0 ;;
2) verblog_end_msg 1 || exit 1 ;;
2) log_end_msg 1 || exit 1 ;;
esac
;;
stop)

26
cluster/saltbase/salt/kube-apiserver/default
View File

@@ -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']}}"

2
cluster/saltbase/salt/kube-apiserver/initd
View File

@@ -78,7 +78,7 @@ case "$1" in
do_start
case "$?" in
0|1) log_end_msg 0 || exit 0 ;;
2) verblog_end_msg 1 || exit 1 ;;
2) log_end_msg 1 || exit 1 ;;
esac
;;
stop)

22
cluster/saltbase/salt/kube-controller-manager/default
View File

@@ -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 -%}

2
cluster/saltbase/salt/kube-controller-manager/initd
View File

@@ -80,7 +80,7 @@ case "$1" in
do_start
case "$?" in
0|1) log_end_msg 0 || exit 0 ;;
2) verblog_end_msg 1 || exit 1 ;;
2) log_end_msg 1 || exit 1 ;;
esac
;;
stop)

4
cluster/saltbase/salt/kube-proxy/default
View File

@@ -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']}}"

2
cluster/saltbase/salt/kube-proxy/initd
View File

@@ -80,7 +80,7 @@ case "$1" in
do_start
case "$?" in
0|1) log_end_msg 0 || exit 0 ;;
2) verblog_end_msg 1 || exit 1 ;;
2) log_end_msg 1 || exit 1 ;;
esac
;;
stop)

2
cluster/saltbase/salt/kube-scheduler/default
View File

@@ -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']}}"

2
cluster/saltbase/salt/kube-scheduler/initd
View File

@@ -80,7 +80,7 @@ case "$1" in
do_start
case "$?" in
0|1) log_end_msg 0 || exit 0 ;;
2) verblog_end_msg 1 || exit 1 ;;
2) log_end_msg 1 || exit 1 ;;
esac
;;
stop)

22
cluster/saltbase/salt/kubelet/default
View File

@@ -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}}"

2
cluster/saltbase/salt/kubelet/initd
View File

@@ -79,7 +79,7 @@ case "$1" in
do_start
case "$?" in
0|1) log_end_msg 0 || exit 0 ;;
2) verblog_end_msg 1 || exit 1 ;;
2) log_end_msg 1 || exit 1 ;;
esac
;;
stop)