add parameter for verbosity
This PR add posibility to set verbosity of kube daemons. Default value
is 2.
Change-Id: I7c2a38aa17a37a160562ee5a1132e13bc08a4608
diff --git a/README.rst b/README.rst
index f34f877..ed82007 100644
--- a/README.rst
+++ b/README.rst
@@ -57,6 +57,17 @@
netchecker:
enabled: true
+Configure service verbosity
+
+.. code-block:: yaml
+
+ parameters:
+ kubernetes:
+ master:
+ verbosity: 2
+ pool:
+ verbosity: 2
+
Enable autoscaler for dns addon. Poll period can be skipped.
.. code-block:: yaml
diff --git a/kubernetes/files/kubelet/default.master b/kubernetes/files/kubelet/default.master
index 644e84d..840b707 100644
--- a/kubernetes/files/kubelet/default.master
+++ b/kubernetes/files/kubelet/default.master
@@ -8,7 +8,7 @@
--register-node=false \
--cluster_domain={{ master.addons.dns.domain }} \
--cni-bin-dir={{ master.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
---v=2 \
+--v={{ master.get('verbosity', 2) }} \
{%- for key, value in master.get('kubelet', {}).get('daemon_opts', {}).iteritems() %}
--{{ key }}="{{ value }}" \
{%- endfor %}
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 6962b12..8cfa3ea 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -9,7 +9,7 @@
--cluster_dns={{ pool.cluster_dns }} \
--cluster_domain={{ pool.cluster_domain }} \
--cni-bin-dir={{ pool.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
---v=2 \
+--v={{ pool.get('verbosity', 2) }} \
{%- if pool.network.engine == 'opencontrail' %}
--network-plugin={{ pool.network.engine }} \
{%- endif %}
diff --git a/kubernetes/files/manifest/kube-apiserver.manifest b/kubernetes/files/manifest/kube-apiserver.manifest
index 8b16b76..353cea1 100644
--- a/kubernetes/files/manifest/kube-apiserver.manifest
+++ b/kubernetes/files/manifest/kube-apiserver.manifest
@@ -29,7 +29,7 @@
--token-auth-file=/srv/kubernetes/known_tokens.csv
--apiserver-count={{ master.apiserver.get('count', 1) }}
--etcd-quorum-read=true
- --v=2
+ --v={{ master.get('verbosity', 2) }}
--allow-privileged=True
{%- if master.apiserver.node_port_range is defined %}
--service-node-port-range {{ master.apiserver.node_port_range }}
diff --git a/kubernetes/files/manifest/kube-controller-manager.manifest b/kubernetes/files/manifest/kube-controller-manager.manifest
index 4ed2475..a3ee84b 100644
--- a/kubernetes/files/manifest/kube-controller-manager.manifest
+++ b/kubernetes/files/manifest/kube-controller-manager.manifest
@@ -19,7 +19,7 @@
--kubeconfig /etc/kubernetes/controller-manager.kubeconfig
--cluster-name=kubernetes
--service-account-private-key-file=/etc/kubernetes/ssl/kubernetes-server.key
- --v=2
+ --v={{ master.get('verbosity', 2) }}
--root-ca-file=/etc/kubernetes/ssl/ca-{{ master.ca }}.crt
--leader-elect=true
{%- for key, value in master.get('controller_manager', {}).get('daemon_opts', {}).iteritems() %}
diff --git a/kubernetes/files/manifest/kube-proxy.manifest.pool b/kubernetes/files/manifest/kube-proxy.manifest.pool
index b648d18..611a95b 100644
--- a/kubernetes/files/manifest/kube-proxy.manifest.pool
+++ b/kubernetes/files/manifest/kube-proxy.manifest.pool
@@ -17,7 +17,7 @@
- /hyperkube
- proxy
--logtostderr=true
- --v=2
+ --v={{ master.get('verbosity', 2) }}
--kubeconfig=/etc/kubernetes/proxy.kubeconfig
--master={%- if pool.apiserver.insecure.enabled %}http://{{ pool.apiserver.host }}:8080{%- else %}https://{{ pool.apiserver.host }}{%- endif %}
{%- if pool.network.engine == 'calico' %}
diff --git a/kubernetes/files/manifest/kube-scheduler.manifest b/kubernetes/files/manifest/kube-scheduler.manifest
index 1a08b9a..60ef676 100644
--- a/kubernetes/files/manifest/kube-scheduler.manifest
+++ b/kubernetes/files/manifest/kube-scheduler.manifest
@@ -19,7 +19,7 @@
- hyperkube
- scheduler
--kubeconfig /etc/kubernetes/scheduler.kubeconfig
- --v=2
+ --v={{ master.get('verbosity', 2) }}
--leader-elect=true
{%- for key, value in master.get('scheduler', {}).get('daemon_opts', {}).iteritems() %}
--{{ key }}={{ value }}
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index 900e908..903f30b 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -93,7 +93,7 @@
--tls-private-key-file=/etc/kubernetes/ssl/kubernetes-server.key
--token-auth-file=/srv/kubernetes/known_tokens.csv
--apiserver-count={{ master.apiserver.get('count', 1) }}
- --v=2
+ --v={{ master.get('verbosity', 2) }}
--etcd-servers=
{%- for member in master.etcd.members -%}
http{% if master.etcd.get('ssl', {}).get('enabled') %}s{% endif %}://{{ member.host }}:{{ member.get('port', 4001) }}{% if not loop.last %},{% endif %}
@@ -137,7 +137,7 @@
--leader-elect=true
--root-ca-file=/etc/kubernetes/ssl/ca-{{ master.ca }}.crt
--service-account-private-key-file=/etc/kubernetes/ssl/kubernetes-server.key
- --v=2
+ --v={{ master.get('verbosity', 2) }}
{%- for key, value in master.get('controller_manager', {}).get('daemon_opts', {}).iteritems() %}
--{{ key }}={{ value }}
{% endfor %}"
@@ -151,7 +151,7 @@
DAEMON_ARGS="
--kubeconfig /etc/kubernetes/scheduler.kubeconfig
--leader-elect=true
- --v=2
+ --v={{ master.get('verbosity', 2) }}
{%- for key, value in master.get('scheduler', {}).get('daemon_opts', {}).iteritems() %}
--{{ key }}={{ value }}
{% endfor %}"
diff --git a/kubernetes/pool/kube-proxy.sls b/kubernetes/pool/kube-proxy.sls
index 5c82fa2..64d2945 100644
--- a/kubernetes/pool/kube-proxy.sls
+++ b/kubernetes/pool/kube-proxy.sls
@@ -37,7 +37,7 @@
- user: root
- group: root
- mode: 644
- - contents: DAEMON_ARGS=" --logtostderr=true --v=2 --kubeconfig=/etc/kubernetes/proxy.kubeconfig {%- if pool.network.engine == 'calico' %} --proxy-mode=iptables{% endif %}{%- for key, value in pool.get('proxy', {}).get('daemon_opts', {}).iteritems() %} --{{ key }}={{ value }}{%- endfor %}"
+ - contents: DAEMON_ARGS=" --logtostderr=true --v={{ pool.get('verbosity', 2) }} --kubeconfig=/etc/kubernetes/proxy.kubeconfig {%- if pool.network.engine == 'calico' %} --proxy-mode=iptables{% endif %}{%- for key, value in pool.get('proxy', {}).get('daemon_opts', {}).iteritems() %} --{{ key }}={{ value }}{%- endfor %}"
pool_services:
service.running: