From 76ddf8e3061af8e9c35775745191ff1977333346 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 26 Jul 2022 10:22:19 +0530 Subject: [PATCH] deploy: introduce new log level for sidecar controllers At present we have single log level configuration for all the containers running for our CSI pods, which has been defaulted to log Level 5. However this cause many logs to be spitted in a cluster and cause log spamming to an extent. This commit introduce one more log level control for CSI pods called sidecarLogLevel which defaults to log Level 1. The sidecar controllers like snapshotter, resizer, attacher..etc has been configured with this new log level and driver pods are with old configruation value. This allow us to have different configuration options for sidecar constrollers and driver pods. With this, we will also have a choice of different configuation setting instead of locking onto one variable for the containers deployed via CSI driver. To summarize the CSI containers maintained by Ceph CSI driver has log level 5 and controllers/sidecars not maintained by Ceph CSI driver has log level 1 configuration. Signed-off-by: Humble Chirammal --- charts/ceph-csi-cephfs/README.md | 1 + .../ceph-csi-cephfs/templates/provisioner-deployment.yaml | 6 +++--- charts/ceph-csi-cephfs/values.yaml | 3 +++ charts/ceph-csi-rbd/README.md | 1 + charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 8 ++++---- charts/ceph-csi-rbd/values.yaml | 3 +++ .../cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 6 +++--- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 2 +- deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml | 6 +++--- deploy/nfs/kubernetes/csi-nfsplugin.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 8 ++++---- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 2 +- 12 files changed, 29 insertions(+), 21 deletions(-) diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md index c22c657c3..4fd98aab8 100644 --- a/charts/ceph-csi-cephfs/README.md +++ b/charts/ceph-csi-cephfs/README.md @@ -86,6 +86,7 @@ charts and their default values. | `serviceAccounts.provisioner.name` | The name of the provisioner ServiceAccount of provisioner to use. If not set and create is true, a name is generated using the fullname | "" | | `csiConfig` | Configuration for the CSI to connect to the cluster | [] | | `logLevel` | Set logging level for csi containers. Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity. | `5` | +| `sidecarLogLevel` | Set logging level for csi sidecar containers. Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity. | `1` | | `nodeplugin.name` | Specifies the nodeplugin name | `nodeplugin` | | `nodeplugin.updateStrategy` | Specifies the update Strategy. If you are using ceph-fuse client set this value to OnDelete | `RollingUpdate` | | `nodeplugin.priorityClassName` | Set user created priorityclassName for csi plugin pods. default is system-node-critical which is highest priority | `system-node-critical` | diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 36591eb9e..bba91272a 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -58,7 +58,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v={{ .Values.logLevel }}" + - "--v={{ .Values.sidecarLogLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" - "--retry-interval-start=500ms" @@ -78,7 +78,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v={{ .Values.logLevel }}" + - "--v={{ .Values.sidecarLogLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" env: @@ -94,7 +94,7 @@ spec: image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}" imagePullPolicy: {{ .Values.provisioner.resizer.image.pullPolicy }} args: - - "--v={{ .Values.logLevel }}" + - "--v={{ .Values.sidecarLogLevel }}" - "--csi-address=$(ADDRESS)" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election" diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index 71ffbf964..0ad9d5253 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -33,7 +33,10 @@ csiConfig: [] # Set logging level for csi containers. # Supported values from 0 to 5. 0 for general useful logs, # 5 for trace level verbosity. +# logLevel is the variable for CSI driver containers's log level logLevel: 5 +# sidecarLogLevel is the variable for Kubernetes sidecar container's log level +sidecarLogLevel: 1 nodeplugin: name: nodeplugin diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index 12ecbf832..4fcf89e91 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -88,6 +88,7 @@ charts and their default values. | `csiMapping` | Configuration details of clusterID,PoolID,FscID mapping | [] | | `encryptionKMSConfig` | Configuration for the encryption KMS | `{}` | | `logLevel` | Set logging level for csi containers. Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity. | `5` | +| `sidecarLogLevel` | Set logging level for csi sidecar containers. Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity. | `1` | | `nodeplugin.name` | Specifies the nodeplugins name | `nodeplugin` | | `nodeplugin.updateStrategy` | Specifies the update Strategy. If you are using ceph-fuse client set this value to OnDelete | `RollingUpdate` | | `nodeplugin.priorityClassName` | Set user created priorityclassName for csi plugin pods. default is system-node-critical which is highest priority | `system-node-critical` | diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 3f81e7631..9e3b30f3e 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -58,7 +58,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v={{ .Values.logLevel }}" + - "--v={{ .Values.sidecarLogLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" - "--retry-interval-start=500ms" @@ -82,7 +82,7 @@ spec: image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}" imagePullPolicy: {{ .Values.provisioner.resizer.image.pullPolicy }} args: - - "--v={{ .Values.logLevel }}" + - "--v={{ .Values.sidecarLogLevel }}" - "--csi-address=$(ADDRESS)" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election" @@ -103,7 +103,7 @@ spec: imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }} args: - "--csi-address=$(ADDRESS)" - - "--v={{ .Values.logLevel }}" + - "--v={{ .Values.sidecarLogLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election=true" - "--extra-create-metadata=true" @@ -120,7 +120,7 @@ spec: image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}" imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }} args: - - "--v={{ .Values.logLevel }}" + - "--v={{ .Values.sidecarLogLevel }}" - "--csi-address=$(ADDRESS)" - "--leader-election=true" - "--retry-interval-start=500ms" diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index e84baf497..5b395584e 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -56,7 +56,10 @@ encryptionKMSConfig: {} # Set logging level for csi containers. # Supported values from 0 to 5. 0 for general useful logs, # 5 for trace level verbosity. +# logLevel is the variable for CSI driver containers's log level logLevel: 5 +# sidecarLogLevel is the variable for Kubernetes sidecar container's log level +sidecarLogLevel: 1 nodeplugin: name: nodeplugin diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index dd0af9326..9aa3512ac 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -46,7 +46,7 @@ spec: image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election=true" - "--retry-interval-start=500ms" @@ -65,7 +65,7 @@ spec: image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election" - "--retry-interval-start=500ms" @@ -82,7 +82,7 @@ spec: image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election=true" env: diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index be90c3515..4bf6d7278 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -29,7 +29,7 @@ spec: allowPrivilegeEscalation: true image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1 args: - - "--v=5" + - "--v=1" - "--csi-address=/csi/csi.sock" - "--kubelet-registration-path=/var/lib/kubelet/plugins/cephfs.csi.ceph.com/csi.sock" env: diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index 360743e9c..61f105906 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -43,7 +43,7 @@ spec: image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election=true" - "--retry-interval-start=500ms" @@ -62,7 +62,7 @@ spec: image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election" - "--retry-interval-start=500ms" @@ -78,7 +78,7 @@ spec: image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election=true" env: diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index ab466af8f..856ba20e6 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -33,7 +33,7 @@ spec: - mountPath: /csi name: socket-dir - args: - - --v=5 + - --v=1 - --csi-address=/csi/csi.sock - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) env: @@ -74,7 +74,7 @@ spec: - mountPath: /registration name: registration-dir - args: - - -v=5 + - -v=1 - --drivername=nfs.csi.ceph.com - --nodeid=$(NODE_ID) - --endpoint=$(CSI_ENDPOINT) diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index bc18167fe..fcafe925e 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -50,7 +50,7 @@ spec: image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--retry-interval-start=500ms" - "--leader-election=true" @@ -72,7 +72,7 @@ spec: image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election=true" - "--extra-create-metadata=true" @@ -86,7 +86,7 @@ spec: - name: csi-attacher image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0 args: - - "--v=5" + - "--v=1" - "--csi-address=$(ADDRESS)" - "--leader-election=true" - "--retry-interval-start=500ms" @@ -101,7 +101,7 @@ spec: image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0 args: - "--csi-address=$(ADDRESS)" - - "--v=5" + - "--v=1" - "--timeout=150s" - "--leader-election" - "--retry-interval-start=500ms" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index b9c894cee..76cf86262 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -31,7 +31,7 @@ spec: allowPrivilegeEscalation: true image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1 args: - - "--v=5" + - "--v=1" - "--csi-address=/csi/csi.sock" - "--kubelet-registration-path=/var/lib/kubelet/plugins/rbd.csi.ceph.com/csi.sock" env: