Merge "Add facility to configure log levels in kubernetes-components"

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)

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'

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

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"

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:

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

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

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

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:

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