Skip to content

Commit b87a3ca

Browse files
authored
Merge pull request #631 from andyzhangx/go-sdk-log-level
feat: add azureGoSDKLogLevel config in chart
2 parents 8a19e3c + 942663b commit b87a3ca

File tree

6 files changed

+7
-1
lines changed

6 files changed

+7
-1
lines changed

charts/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The following table lists the configurable parameters of the latest Azure Blob S
5858
| `driver.name` | alternative driver name | `blob.csi.azure.com` |
5959
| `driver.customUserAgent` | custom userAgent | `` |
6060
| `driver.userAgentSuffix` | userAgent suffix | `OSS-helm` |
61+
| `driver.azureGoSDKLogLevel` | [Azure go sdk log level](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/previous-versions-quickstart.md#built-in-basic-requestresponse-logging) | ``(no logs), `DEBUG`, `INFO`, `WARNING`, `ERROR`, [etc](https://github.com/Azure/go-autorest/blob/50e09bb39af124f28f29ba60efde3fa74a4fe93f/logger/logger.go#L65-L73) |
6162
| `feature.enableFSGroupPolicy` | enable `fsGroupPolicy` on a k8s 1.20+ cluster | `false` |
6263
| `feature.enableGetVolumeStats` | allow GET_VOLUME_STATS on agent node | `false` |
6364
| `image.baseRepo` | base repository of driver images | `mcr.microsoft.com` |
82 Bytes
Binary file not shown.

charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ spec:
124124
optional: true
125125
- name: CSI_ENDPOINT
126126
value: unix:///csi/csi.sock
127+
- name: AZURE_GO_SDK_LOG_LEVEL
128+
value: {{ .Values.driver.azureGoSDKLogLevel }}
127129
{{- if eq .Values.cloud "AzureStackCloud" }}
128130
- name: AZURE_ENVIRONMENT_FILEPATH
129131
value: /etc/kubernetes/azurestackcloud.json

charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ spec:
153153
fieldRef:
154154
apiVersion: v1
155155
fieldPath: spec.nodeName
156+
- name: AZURE_GO_SDK_LOG_LEVEL
157+
value: {{ .Values.driver.azureGoSDKLogLevel }}
156158
{{- if eq .Values.cloud "AzureStackCloud" }}
157159
- name: AZURE_ENVIRONMENT_FILEPATH
158160
value: /etc/kubernetes/azurestackcloud.json

charts/latest/blob-csi-driver/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ driver:
154154
name: blob.csi.azure.com
155155
customUserAgent: ""
156156
userAgentSuffix: "OSS-helm"
157+
azureGoSDKLogLevel: "" # available values: ""(no logs), DEBUG, INFO, WARNING, ERROR
157158

158159
linux:
159160
kubelet: /var/lib/kubelet

test/external-e2e/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ setup_e2e_binaries() {
2929
curl -sL https://storage.googleapis.com/kubernetes-release/release/v1.23.0/kubernetes-test-linux-amd64.tar.gz --output e2e-tests.tar.gz
3030
tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz
3131

32-
export EXTRA_HELM_OPTIONS="--set driver.name=$DRIVER.csi.azure.com --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node --set image.csiProvisioner.tag=v3.0.0"
32+
export EXTRA_HELM_OPTIONS="--set driver.name=$DRIVER.csi.azure.com --set controller.name=csi-$DRIVER-controller --set node.name=csi-$DRIVER-node --set driver.azureGoSDKLogLevel=INFO"
3333
if [ ! -z ${EXTERNAL_E2E_TEST_NFS} ]; then
3434
# enable fsGroupPolicy (only available from k8s 1.20)
3535
export EXTRA_HELM_OPTIONS=$EXTRA_HELM_OPTIONS" --set feature.enableFSGroupPolicy=true"

0 commit comments

Comments
 (0)