Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#43 from RomanBednar/rebase-v1.29.2
Browse files Browse the repository at this point in the history
STOR-1390: Rebase v1.29.2 for OCP 4.15
  • Loading branch information
openshift-merge-bot[bot] authored Nov 30, 2023
2 parents 469c486 + 6cb143e commit 18c0abf
Show file tree
Hide file tree
Showing 2,272 changed files with 148,741 additions and 35,800 deletions.
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
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.2
# Use a custom version for E2E tests if we are testing in CI
ifdef CI
ifndef PUBLISH
Expand Down
6 changes: 3 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.2 |mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.29.2 | 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
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://raw.githubusercontent.com/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.2
```

### 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 18c0abf

Please sign in to comment.