Skip to content

Commit 6b8ce46

Browse files
committed
feat: add fsGroupPolicy parameter in helm chart
fix
1 parent 134ad5e commit 6b8ce46

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

charts/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The following table lists the configurable parameters of the latest Azure Blob S
5959
| `driver.customUserAgent` | custom userAgent | `` |
6060
| `driver.userAgentSuffix` | userAgent suffix | `OSS-helm` |
6161
| `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) |
62-
| `feature.enableFSGroupPolicy` | enable `fsGroupPolicy` on a k8s 1.20+ cluster | `false` |
62+
| `feature.fsGroupPolicy` | CSIDriver FSGroupPolicy value | `ReadWriteOnceWithFSType`(available values: `ReadWriteOnceWithFSType`, `File`, `None`) |
6363
| `feature.enableGetVolumeStats` | allow GET_VOLUME_STATS on agent node | `false` |
6464
| `image.baseRepo` | base repository of driver images | `mcr.microsoft.com` |
6565
| `image.blob.repository` | blob-csi-driver docker image | `mcr.microsoft.com/oss/kubernetes-csi/blob-csi` |
2 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ metadata:
88
spec:
99
attachRequired: false
1010
podInfoOnMount: true
11-
{{- if .Values.feature.enableFSGroupPolicy}}
12-
fsGroupPolicy: File
13-
{{- end}}
11+
fsGroupPolicy: {{ .Values.feature.fsGroupPolicy }}
1412
volumeLifecycleModes:
1513
- Persistent
1614
- Ephemeral

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ node:
151151
- operator: "Exists"
152152

153153
feature:
154-
enableFSGroupPolicy: false
154+
fsGroupPolicy: ReadWriteOnceWithFSType
155155
enableGetVolumeStats: false
156156

157157
driver:

deploy/csi-blob-driver.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
spec:
77
attachRequired: false
88
podInfoOnMount: true
9+
fsGroupPolicy: ReadWriteOnceWithFSType
910
volumeLifecycleModes:
1011
- Persistent
1112
- Ephemeral

deploy/example/fsgroup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### Option#1: Enable fsGroupPolicy support in [driver helm installation](../../../charts)
66

7-
add `--set feature.enableFSGroupPolicy=true` in helm installation command.
7+
add `--set feature.fsGroupPolicy=File` in helm installation command.
88

99
### Option#2: Enable fsGroupPolicy support on a cluster with CSI driver already installed
1010

test/external-e2e/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ setup_e2e_binaries() {
2727
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"
2828
if [ ! -z ${EXTERNAL_E2E_TEST_NFS} ]; then
2929
# enable fsGroupPolicy (only available from k8s 1.20)
30-
export EXTRA_HELM_OPTIONS=$EXTRA_HELM_OPTIONS" --set feature.enableFSGroupPolicy=true"
30+
export EXTRA_HELM_OPTIONS=$EXTRA_HELM_OPTIONS" --set feature.fsGroupPolicy=File"
3131
fi
3232

3333
# test on alternative driver name

0 commit comments

Comments
 (0)