Skip to content

Commit 0e7d2c9

Browse files
authored
Merge pull request #2624 from AndrewSirenko/debugMode
Add debugLogs parameter to helm chart
2 parents 7ede9a3 + 6cec0ab commit 0e7d2c9

File tree

5 files changed

+48
-1
lines changed

5 files changed

+48
-1
lines changed

charts/aws-ebs-csi-driver/templates/_node-windows.tpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ spec:
8888
{{- with .Values.node.loggingFormat }}
8989
- --logging-format={{ . }}
9090
{{- end }}
91+
{{- if .Values.debugLogs }}
92+
- --v=7
93+
{{- else }}
9194
- --v={{ .Values.node.logLevel }}
95+
{{- end }}
9296
{{- if .Values.node.otelTracing }}
9397
- --enable-otel-tracing=true
9498
{{- end}}
@@ -181,7 +185,11 @@ spec:
181185
{{- if .Values.node.windowsHostProcess }}
182186
- --plugin-registration-path=$(PLUGIN_REG_DIR)
183187
{{- end }}
188+
{{- if .Values.debugLogs }}
189+
- --v=7
190+
{{- else }}
184191
- --v={{ .Values.sidecars.nodeDriverRegistrar.logLevel }}
192+
{{- end }}
185193
env:
186194
- name: ADDRESS
187195
{{- if .Values.node.windowsHostProcess }}

charts/aws-ebs-csi-driver/templates/_node.tpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ spec:
9292
{{- with .Values.node.loggingFormat }}
9393
- --logging-format={{ . }}
9494
{{- end }}
95+
{{- if .Values.debugLogs }}
96+
- --v=7
97+
{{- else }}
9598
- --v={{ .Values.node.logLevel }}
99+
{{- end }}
96100
{{- if .Values.node.otelTracing }}
97101
- --enable-otel-tracing=true
98102
{{- end}}
@@ -181,7 +185,11 @@ spec:
181185
args:
182186
- --csi-address=$(ADDRESS)
183187
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
188+
{{- if .Values.debugLogs }}
189+
- --v=7
190+
{{- else }}
184191
- --v={{ .Values.sidecars.nodeDriverRegistrar.logLevel }}
192+
{{- end }}
185193
{{- range .Values.sidecars.nodeDriverRegistrar.additionalArgs }}
186194
- {{ . }}
187195
{{- end }}

charts/aws-ebs-csi-driver/templates/controller.yaml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ spec:
8888
{{- with .Values.controller.httpEndpoint }}
8989
- --http-endpoint={{ . }}
9090
{{- end }}
91-
{{- if .Values.controller.sdkDebugLog }}
91+
{{- if or .Values.controller.sdkDebugLog .Values.debugLogs }}
9292
- --aws-sdk-debug-log=true
9393
{{- end}}
9494
{{- if .Values.controller.batching }}
@@ -103,7 +103,11 @@ spec:
103103
{{- if .Values.controller.otelTracing }}
104104
- --enable-otel-tracing=true
105105
{{- end}}
106+
{{- if .Values.debugLogs }}
107+
- --v=7
108+
{{- else }}
106109
- --v={{ .Values.controller.logLevel }}
110+
{{- end }}
107111
{{- range .Values.controller.additionalArgs }}
108112
- {{ . }}
109113
{{- end }}
@@ -211,7 +215,11 @@ spec:
211215
- --timeout=60s
212216
{{- end }}
213217
- --csi-address=$(ADDRESS)
218+
{{- if .Values.debugLogs }}
219+
- --v=7
220+
{{- else }}
214221
- --v={{ .Values.sidecars.provisioner.logLevel }}
222+
{{- end }}
215223
- --feature-gates=Topology=true
216224
{{- if .Values.controller.extraCreateMetadata }}
217225
- --extra-create-metadata
@@ -278,7 +286,11 @@ spec:
278286
- --timeout=6m
279287
{{- end }}
280288
- --csi-address=$(ADDRESS)
289+
{{- if .Values.debugLogs }}
290+
- --v=7
291+
{{- else }}
281292
- --v={{ .Values.sidecars.attacher.logLevel }}
293+
{{- end }}
282294
- --leader-election={{ .Values.sidecars.attacher.leaderElection.enabled | required "leader election state for csi-attacher is required, must be set to true || false." }}
283295
{{- if .Values.sidecars.attacher.leaderElection.enabled }}
284296
{{- if .Values.sidecars.attacher.leaderElection.leaseDuration }}
@@ -336,7 +348,11 @@ spec:
336348
args:
337349
- --csi-address=$(ADDRESS)
338350
- --leader-election=true
351+
{{- if .Values.debugLogs }}
352+
- --v=7
353+
{{- else }}
339354
- --v={{ .Values.sidecars.snapshotter.logLevel }}
355+
{{- end }}
340356
{{- if .Values.controller.extraCreateMetadata }}
341357
- --extra-create-metadata
342358
{{- end}}
@@ -388,7 +404,11 @@ spec:
388404
- --timeout=60s
389405
{{- end }}
390406
- --csi-address=$(ADDRESS)
407+
{{- if .Values.debugLogs }}
408+
- --v=7
409+
{{- else }}
391410
- --v={{ .Values.sidecars.volumemodifier.logLevel }}
411+
{{- end }}
392412
- --leader-election={{ .Values.sidecars.volumemodifier.leaderElection.enabled | required "leader election state for csi-volumemodifier is required, must be set to true || false." }}
393413
{{- if .Values.sidecars.volumemodifier.leaderElection.enabled }}
394414
{{- if .Values.sidecars.volumemodifier.leaderElection.leaseDuration }}
@@ -451,7 +471,11 @@ spec:
451471
- --extra-modify-metadata
452472
{{- end}}
453473
- --csi-address=$(ADDRESS)
474+
{{- if .Values.debugLogs }}
475+
- --v=7
476+
{{- else }}
454477
- --v={{ .Values.sidecars.resizer.logLevel }}
478+
{{- end }}
455479
- --handle-volume-inuse-error=false
456480
{{- with .Values.sidecars.resizer.leaderElection }}
457481
- --leader-election={{ .enabled | default true }}

charts/aws-ebs-csi-driver/values.schema.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@
126126
"description": "Instruct the AWS SDK to use AWS FIPS endpoints, and deploy container built with BoringCrypto (a FIPS-validated cryptographic library) instead of the Go default. The EBS CSI Driver FIPS images have not undergone FIPS certification, and no official guarantee is made about the compliance of these images under the FIPS standard. Users relying on these images for FIPS compliance should perform their own independent evaluation",
127127
"default": "false"
128128
},
129+
"debugLogs": {
130+
"type": "boolean",
131+
"description": "Set maximum verbosity for logs of each container and other recommended debugging parameters such as enabling AWS SDK debug logging",
132+
"default": "false"
133+
},
129134
"fullnameOverride": {
130135
"type": ["string", "null"],
131136
"default": ""

charts/aws-ebs-csi-driver/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,8 @@ useOldCSIDriver: false
524524
nodeAllocatableUpdatePeriodSeconds: 10
525525
# Deploy EBS CSI Driver without controller and associated resources
526526
nodeComponentOnly: false
527+
# Set maximum verbosity for logs of each container and other recommended debugging parameters such as enabling AWS SDK debug logging
528+
debugLogs: false
527529
helmTester:
528530
enabled: true
529531
# Supply a custom image to the ebs-csi-driver-test pod in helm-tester.yaml

0 commit comments

Comments
 (0)