From 551a5018d0dc2d7d5d377867ce04bf829f8a0805 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 20 Oct 2020 12:19:10 +0530 Subject: [PATCH] helm: make log level configurable instead of keeping the log level at 5, which is required only for tracing the errors. this commit adds an option for users to configure the log level for all containers. Signed-off-by: Madhu Rajanna --- .../templates/nodeplugin-daemonset.yaml | 4 ++-- .../templates/provisioner-deployment.yaml | 10 +++++----- charts/ceph-csi-cephfs/values.yaml | 5 +++++ .../ceph-csi-rbd/templates/nodeplugin-daemonset.yaml | 4 ++-- .../ceph-csi-rbd/templates/provisioner-deployment.yaml | 10 +++++----- charts/ceph-csi-rbd/values.yaml | 5 +++++ 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml index 18884ca6c..8b5d8a6e5 100644 --- a/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-cephfs/templates/nodeplugin-daemonset.yaml @@ -41,7 +41,7 @@ spec: image: "{{ .Values.nodeplugin.registrar.image.repository }}:{{ .Values.nodeplugin.registrar.image.tag }}" imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }} args: - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - "--kubelet-registration-path={{ .Values.socketDir }}/{{ .Values.pluginSocketFile }}" env: @@ -68,7 +68,7 @@ spec: - "--forcecephkernelclient={{ .Values.nodeplugin.forcecephkernelclient }}" {{- end }} - "--endpoint=$(CSI_ENDPOINT)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--drivername=$(DRIVER_NAME)" {{- if .Values.topology.enabled }} - "--domainlabels={{ .Values.topology.domainLabels | join "," }}" diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 74078f544..86e02b437 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -48,7 +48,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--enable-leader-election=true" - "--leader-election-type=leases" @@ -69,7 +69,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" env: @@ -87,7 +87,7 @@ spec: image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--csi-address=$(ADDRESS)" - "--leader-election=true" - "--retry-interval-start=500ms" @@ -106,7 +106,7 @@ spec: image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}" imagePullPolicy: {{ .Values.provisioner.resizer.image.pullPolicy }} args: - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--csi-address=$(ADDRESS)" - "--csiTimeout={{ .Values.provisioner.timeout }}" - "--leader-election" @@ -130,7 +130,7 @@ spec: - "--controllerserver=true" - "--pidlimit=-1" - "--endpoint=$(CSI_ENDPOINT)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--drivername=$(DRIVER_NAME)" env: - name: POD_IP diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index e26abdfe0..efbb53fa6 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -29,6 +29,11 @@ serviceAccounts: # subvolumeGroup: "csi" csiConfig: [] +# Set logging level for csi containers. +# Supported values from 0 to 5. 0 for general useful logs, +# 5 for trace level verbosity. +logLevel: 5 + nodeplugin: name: nodeplugin # if you are using ceph-fuse client set this value to OnDelete diff --git a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml index 484b53eb1..693c3a3af 100644 --- a/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml +++ b/charts/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml @@ -42,7 +42,7 @@ spec: image: "{{ .Values.nodeplugin.registrar.image.repository }}:{{ .Values.nodeplugin.registrar.image.tag }}" imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }} args: - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--csi-address=/csi/{{ .Values.pluginSocketFile }}" - "--kubelet-registration-path={{ .Values.socketDir }}/{{ .Values.pluginSocketFile }}" env: @@ -66,7 +66,7 @@ spec: - "--nodeserver=true" - "--pidlimit=-1" - "--endpoint=$(CSI_ENDPOINT)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--drivername=$(DRIVER_NAME)" {{- if .Values.topology.enabled }} - "--domainlabels={{ .Values.topology.domainLabels | join "," }}" diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index e5274eec4..7662e2e64 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -48,7 +48,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--enable-leader-election=true" - "--leader-election-type=leases" @@ -69,7 +69,7 @@ spec: image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}" imagePullPolicy: {{ .Values.provisioner.resizer.image.pullPolicy }} args: - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--csi-address=$(ADDRESS)" - "--csiTimeout={{ .Values.provisioner.timeout }}" - "--leader-election" @@ -88,7 +88,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" env: @@ -106,7 +106,7 @@ spec: image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--csi-address=$(ADDRESS)" - "--leader-election=true" - "--retry-interval-start=500ms" @@ -128,7 +128,7 @@ spec: - "--controllerserver=true" - "--pidlimit=-1" - "--endpoint=$(CSI_ENDPOINT)" - - "--v=5" + - "--v={{ .Values.logLevel }}" - "--drivername=$(DRIVER_NAME)" - "--rbdhardmaxclonedepth={{ .Values.provisioner.hardMaxCloneDepth }}" - "--rbdsoftmaxclonedepth={{ .Values.provisioner.softMaxCloneDepth }}" diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 898f639d5..4cc45ac1f 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -41,6 +41,11 @@ csiConfig: [] # vaultCAVerify: "false" encryptionKMSConfig: {} +# Set logging level for csi containers. +# Supported values from 0 to 5. 0 for general useful logs, +# 5 for trace level verbosity. +logLevel: 5 + nodeplugin: name: nodeplugin # if you are using rbd-nbd client set this value to OnDelete