Skip to content

Commit

Permalink
Merge pull request #75 from gnufied/rebase-v1.29.3
Browse files Browse the repository at this point in the history
STOR-1579: Rebase v1.29.3
  • Loading branch information
openshift-merge-bot[bot] committed Feb 7, 2024
2 parents e5c4b2a + a63fa78 commit 0b2b8d6
Show file tree
Hide file tree
Showing 372 changed files with 32,282 additions and 4,428 deletions.
13 changes: 13 additions & 0 deletions .golangci.yml
Expand Up @@ -7,3 +7,16 @@ linters:
- structcheck
enable:
- golint

linters-settings:
depguard:
rules:
main:
files:
- $all
- "!$test"
allow:
- $gostd
- k8s.io
- sigs.k8s.io
- github.com
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -19,7 +19,7 @@ REGISTRY_NAME ?= $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
IMAGE_NAME ?= azuredisk-csi
ifneq ($(BUILD_V2), true)
PLUGIN_NAME = azurediskplugin
IMAGE_VERSION ?= v1.29.0
IMAGE_VERSION ?= v1.29.3
CHART_VERSION ?= latest
else
PLUGIN_NAME = azurediskpluginv2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -23,7 +23,7 @@ V2: Preview
|Driver Version |Image | supported k8s version |
|----------------|-----------------------------------------------------------|-----------------------|
|`master` branch |mcr.microsoft.com/k8s/csi/azuredisk-csi:latest | 1.21+ |
|v1.29.0 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.0 | 1.21+ |
|v1.29.3 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.3 | 1.21+ |
|v1.28.3 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.3 | 1.21+ |
|v1.27.1 |mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.27.1 | 1.21+ |

Expand Down
6 changes: 3 additions & 3 deletions charts/README.md
Expand Up @@ -71,7 +71,7 @@ helm repo update azuredisk-csi-driver
### install a specific version

```console
helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --namespace kube-system --version v1.29.0
helm install azuredisk-csi-driver azuredisk-csi-driver/azuredisk-csi-driver --namespace kube-system --version v1.29.3
```

### install on Azure Stack
Expand Down Expand Up @@ -205,10 +205,10 @@ The following table lists the configurable parameters of the latest Azure Disk 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.2` |
| `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.2` |
| `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

0 comments on commit 0b2b8d6

Please sign in to comment.