Skip to content

Commit c481e92

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #116 from RomanBednar/rebase-v1.35.0
STOR-2761: Rebase to upstream v1.35.0 for OCP 4.22
2 parents 489fa12 + 9c68feb commit c481e92

File tree

793 files changed

+100413
-14771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

793 files changed

+100413
-14771
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD)
1717
REGISTRY ?= andyzhangx
1818
REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
1919
IMAGE_NAME ?= azurefile-csi
20-
IMAGE_VERSION ?= v1.34.1
20+
IMAGE_VERSION ?= v1.35.0
2121
# Use a custom version for E2E tests if we are testing in CI
2222
ifdef CI
2323
ifndef PUBLISH

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
### About
99
This driver allows Kubernetes to access [Azure File](https://docs.microsoft.com/en-us/azure/storage/files/storage-files-introduction) volume using smb and nfs protocols, csi plugin name: `file.csi.azure.com`.
10-
> This driver only permits the mounting of SMB file shares using key-based (NTLM v2) authentication, and therefore does not support the maximum security profile of Azure File share settings. On the other hand, mounting NFS file shares does not require key-based authentication.
1110

1211
Disclaimer: Deploying this driver manually is not an officially supported Microsoft product. For a fully managed and supported experience on Kubernetes, use [AKS with the managed Azure File CSI driver](https://learn.microsoft.com/azure/aks/azure-files-csi).
1312

@@ -17,9 +16,9 @@ Disclaimer: Deploying this driver manually is not an officially supported Micros
1716
|Driver Version |Image | supported k8s version |
1817
|----------------|---------------------------------------------------------- |-----------------------|
1918
|master branch |mcr.microsoft.com/k8s/csi/azurefile-csi:latest | 1.21+ |
20-
|v1.34.1 |mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.1 | 1.21+ |
21-
|v1.33.4 |mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.33.4-2 | 1.21+ |
22-
|v1.32.6 |mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.32.6-3 | 1.21+ |
19+
|v1.35.0 |mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.35.0 | 1.21+ |
20+
|v1.34.3 |mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.34.3 | 1.21+ |
21+
|v1.33.7 |mcr.microsoft.com/oss/v2/kubernetes-csi/azurefile-csi:v1.33.7 | 1.21+ |
2322

2423
### Driver parameters
2524
Please refer to [driver parameters](./docs/driver-parameters.md)
@@ -52,10 +51,11 @@ This option does not depend on cloud provider config file, supports cross subscr
5251
### Features
5352
- [Windows](./deploy/example/windows)
5453
- [NFS](./deploy/example/nfs)
55-
- [Volume Snapshot](./deploy/example/snapshot)
54+
- [Volume Snapshot and Restore](./deploy/example/snapshot)
5655
- [Volume Expansion](./deploy/example/resize)
5756
- [Volume Cloning](./deploy/example/cloning)
58-
- [Workload identity](./docs/workload-identity-static-pv-mount.md)
57+
- [Mount with workload identity](./docs/workload-identity-static-pv-mount.md)
58+
- [Mount with managed identity](./docs/managed-identity-mount.md)
5959

6060
### Troubleshooting
6161
- [CSI driver troubleshooting guide](./docs/csi-debug.md)

‎charts/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
### install a specific version
1919
```console
2020
helm repo add azurefile-csi-driver https://raw.githubusercontent.com/kubernetes-sigs/azurefile-csi-driver/master/charts
21-
helm install azurefile-csi-driver azurefile-csi-driver/azurefile-csi-driver --namespace kube-system --version 1.33.4
21+
helm install azurefile-csi-driver azurefile-csi-driver/azurefile-csi-driver --namespace kube-system --version 1.35.0
2222
```
2323

2424
### install on RedHat/CentOS
@@ -61,10 +61,10 @@ The following table lists the configurable parameters of the latest Azure File C
6161
| `image.azurefile.tag` | azurefile-csi-driver container image tag | `` |
6262
| `image.azurefile.pullPolicy` | azurefile-csi-driver image pull policy | `IfNotPresent` |
6363
| `image.csiProvisioner.repository` | csi-provisioner container image | `/oss/kubernetes-csi/csi-provisioner` |
64-
| `image.csiProvisioner.tag` | csi-provisioner container image tag | `v5.2.0` |
64+
| `image.csiProvisioner.tag` | csi-provisioner container image tag | `v6.1.0` |
6565
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
6666
| `image.csiResizer.repository` | csi-resizer container image | `/oss/kubernetes-csi/csi-resizer` |
67-
| `image.csiResizer.tag` | csi-resizer container image tag | `v1.13.2` |
67+
| `image.csiResizer.tag` | csi-resizer container image tag | `v2.0.0` |
6868
| `image.csiResizer.pullPolicy` | csi-resizer image pull policy | `IfNotPresent` |
6969
| `image.livenessProbe.repository` | liveness-probe container image | `/oss/kubernetes-csi/livenessprobe` |
7070
| `image.livenessProbe.tag` | liveness-probe container image tag | `v2.15.0` |
@@ -127,10 +127,10 @@ The following table lists the configurable parameters of the latest Azure File C
127127
| `node.logLevel` | node driver log level |`5` |
128128
| `snapshot.enabled` | whether enable snapshot feature | `false` |
129129
| `snapshot.image.csiSnapshotter.repository` | csi-snapshotter container image | `/oss/kubernetes-csi/csi-snapshotter` |
130-
| `snapshot.image.csiSnapshotter.tag` | csi-snapshotter container image tag | `v8.3.0` |
130+
| `snapshot.image.csiSnapshotter.tag` | csi-snapshotter container image tag | `v8.4.0` |
131131
| `snapshot.image.csiSnapshotter.pullPolicy` | csi-snapshotter image pull policy | `IfNotPresent` |
132132
| `snapshot.image.csiSnapshotController.repository` | snapshot-controller container image | `/oss/kubernetes-csi/snapshot-controller` |
133-
| `snapshot.image.csiSnapshotController.tag` | snapshot-controller container image tag | `v8.3.0` |
133+
| `snapshot.image.csiSnapshotController.tag` | snapshot-controller container image tag | `v8.4.0` |
134134
| `snapshot.image.csiSnapshotController.pullPolicy` | snapshot-controller image pull policy | `IfNotPresent` |
135135
| `snapshot.snapshotController.name` | snapshot controller name | `csi-snapshot-controller` |
136136
| `snapshot.snapshotController.replicas` | the replicas of snapshot-controller | `2` |

0 commit comments

Comments
 (0)