From 7f63537f8a790183a818f5d33448739daf8d851c Mon Sep 17 00:00:00 2001 From: Luna Das Date: Fri, 24 May 2019 18:03:52 +0530 Subject: [PATCH] Add facility to configure log levels in kubernetes-components Change-Id: Ib7c481b71818c6673cd0b9c47d282d4a3f42d307 --- charts/apiserver-webhook/templates/deployment.yaml | 3 +++ charts/apiserver-webhook/values.yaml | 8 +++++++- .../templates/etc/_kubernetes-apiserver.yaml.tpl | 3 +++ charts/apiserver/values.yaml | 5 +++++ .../templates/etc/_kubernetes-controller-manager.yaml.tpl | 4 +++- charts/controller_manager/values.yaml | 5 +++++ charts/proxy/templates/daemonset.yaml | 3 +++ charts/proxy/values.yaml | 7 +++++++ .../templates/etc/_kubernetes-scheduler.yaml.tpl | 3 +++ charts/scheduler/values.yaml | 6 +++++- 10 files changed, 44 insertions(+), 3 deletions(-) diff --git a/charts/apiserver-webhook/templates/deployment.yaml b/charts/apiserver-webhook/templates/deployment.yaml index 42f021d1..d500c706 100644 --- a/charts/apiserver-webhook/templates/deployment.yaml +++ b/charts/apiserver-webhook/templates/deployment.yaml @@ -138,6 +138,9 @@ spec: {{- range .Values.command_prefix }} - {{ . }} {{- end }} + {{- if $envAll.Values.apiserver_webhook.logging.log_level }} + - --v={{ $envAll.Values.apiserver_webhook.logging.log_level }} + {{- end }} - --service-cluster-ip-range={{ $envAll.Values.network.service_cidr }} - --authorization-mode=Webhook - --advertise-address=$(POD_IP) diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index cb195928..3d3dbfce 100644 --- a/charts/apiserver-webhook/values.yaml +++ b/charts/apiserver-webhook/values.yaml @@ -40,7 +40,13 @@ labels: command_prefix: - /apiserver - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds - - --v=5 + +apiserver_webhook: + logging: + # Which messages to log. + # Valid values include any number from 0 to 9. + # Default 5(Trace level verbosity). + log_level: 5 network: pod_cidr: '10.97.0.0/16' diff --git a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl index 1689dfc0..958d45c7 100644 --- a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl +++ b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl @@ -91,6 +91,9 @@ spec: - --{{ $key }}={{ $val }} {{- end }} {{- end }} + {{- if .Values.apiserver.logging.log_level }} + - --v={{ .Values.apiserver.logging.log_level }} + {{- end }} ports: - containerPort: {{ .Values.network.kubernetes_apiserver.port }} diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index e438e2ec..de34de42 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -157,6 +157,11 @@ apiserver: etcd: endpoints: https://kubernetes-etcd.kube-system.svc.cluster.local host_etc_path: /etc/kubernetes/apiserver + logging: + # Which messages to log. + # Valid values include any number from 0 to 9. + # Default 5(Trace level verbosity). + log_level: 5 #XXX another possible configuration # tls: # tls-cipher-suites: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA" diff --git a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl index 8d8c8133..ffb5244c 100644 --- a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl +++ b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl @@ -49,7 +49,9 @@ spec: - --root-ca-file=/etc/kubernetes/controller-manager/cluster-ca.pem - --service-account-private-key-file=/etc/kubernetes/controller-manager/service-account.priv - --use-service-account-credentials=true - - --v=5 + {{- if .Values.controller_manager.logging.log_level }} + - --v={{ .Values.controller_manager.logging.log_level }} + {{- end }} readinessProbe: httpGet: diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index 2052550c..9a52eb40 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -47,6 +47,11 @@ anchor: controller_manager: host_etc_path: /etc/kubernetes/controller-manager + logging: + # Which messages to log. + # Valid values include any number from 0 to 9. + # Default 5(Trace level verbosity). + log_level: 5 command_prefix: - /controller-manager diff --git a/charts/proxy/templates/daemonset.yaml b/charts/proxy/templates/daemonset.yaml index 8a7badfa..8105768b 100644 --- a/charts/proxy/templates/daemonset.yaml +++ b/charts/proxy/templates/daemonset.yaml @@ -59,6 +59,9 @@ spec: - {{ . }} {{- end }} - --hostname-override=$(NODE_NAME) + {{- if .Values.proxy.logging.log_level }} + - --v={{ .Values.proxy.logging.log_level }} + {{- end }} {{ tuple $envAll $envAll.Values.pod.resources.proxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }} securityContext: privileged: true diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml index b03e2ae0..4d462a60 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -44,6 +44,13 @@ images: proxy: gcr.io/google_containers/hyperkube-amd64:v1.11.6 pull_policy: "IfNotPresent" +proxy: + logging: + # Which messages to log. + # Valid values include any number from 0 to 9. + # Default 5(Trace level verbosity). + log_level: 5 + command_prefix: - /proxy - --proxy-mode=iptables diff --git a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl index 3f1b5257..aef3baba 100644 --- a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl +++ b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl @@ -45,6 +45,9 @@ spec: - --port={{ .Values.network.kubernetes_scheduler.port }} - --leader-elect=true - --kubeconfig=/etc/kubernetes/scheduler/kubeconfig.yaml + {{- if .Values.scheduler.logging.log_level }} + - --v={{ .Values.scheduler.logging.log_level }} + {{- end }} readinessProbe: httpGet: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index 3db78be5..11c8ec9f 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -55,6 +55,11 @@ pod: scheduler: host_etc_path: /etc/kubernetes/scheduler + logging: + # Which messages to log. + # Valid values include any number from 0 to 9. + # Default 5(Trace level verbosity). + log_level: 5 secrets: tls: @@ -79,4 +84,3 @@ service: command_prefix: - /scheduler - --feature-gates=TaintNodesByCondition=true - - --v=5