Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into mkandawires/sync-…
Browse files Browse the repository at this point in the history
…upstream-fix-cves
  • Loading branch information
Stephen Mkandawire committed Dec 1, 2023
2 parents 064b3c6 + 75508df commit 384c2fb
Show file tree
Hide file tree
Showing 1,577 changed files with 300,969 additions and 18,531 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ jobs:
- name: Run linter
uses: golangci/golangci-lint-action@v3
with:
version: v1.51
args: -E=gofmt,deadcode,unused,varcheck,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
version: v1.54
args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
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: 0 additions & 2 deletions .trivyignore

This file was deleted.

17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,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/blob-csi:latest | 1.21+ |
|v1.23.0 |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.23.0 | 1.21+ |
|v1.22.2 |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.22.2 | 1.21+ |
|v1.21.4 |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.21.4 | 1.21+ |
|v1.23.2 |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.23.2 | 1.21+ |
|v1.22.4 |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.22.4 | 1.21+ |
|v1.21.6 |mcr.microsoft.com/oss/kubernetes-csi/blob-csi:v1.21.6 | 1.21+ |

### Driver parameters
Please refer to `blob.csi.azure.com` [driver parameters](./docs/driver-parameters.md)
Expand All @@ -40,16 +40,16 @@ This option does not depend on cloud provider config file, supports cross subscr
### Install driver on a Kubernetes cluster
> Note: this feature is only available in v1.19.5, v1.21.1 and later versions.
>
> To install specific blobfuse v1 version, run following command directly after driver is running on the agent node:
> Execute following command to install a specific version of blobfuse v2 once driver is running on the agent node:
> ```console
> kubectl patch daemonset csi-blob-node -n kube-system -p '{"spec":{"template":{"spec":{"initContainers":[{"env":[{"name":"INSTALL_BLOBFUSE","value":"true"},{"name":"BLOBFUSE_VERSION","value":"1.4.5"}],"name":"install-blobfuse-proxy"}]}}}}'
> kubectl patch daemonset csi-blob-node -n kube-system -p '{"spec":{"template":{"spec":{"initContainers":[{"env":[{"name":"INSTALL_BLOBFUSE2","value":"true"},{"name":"BLOBFUSE2_VERSION","value":"2.1.2"}],"name":"install-blobfuse-proxy"}]}}}}'
> ```
>
> To install specific blobfuse v2 version, run following command directly after driver is running on the agent node:
> Execute following command to install a specific version of blobfuse v1 once driver is running on the agent node:
> ```console
> kubectl patch daemonset csi-blob-node -n kube-system -p '{"spec":{"template":{"spec":{"initContainers":[{"env":[{"name":"INSTALL_BLOBFUSE2","value":"true"},{"name":"BLOBFUSE2_VERSION","value":"2.1.0"}],"name":"install-blobfuse-proxy"}]}}}}'
> kubectl patch daemonset csi-blob-node -n kube-system -p '{"spec":{"template":{"spec":{"initContainers":[{"env":[{"name":"INSTALL_BLOBFUSE","value":"true"},{"name":"BLOBFUSE_VERSION","value":"1.4.5"}],"name":"install-blobfuse-proxy"}]}}}}'
> ```
>
- install by [helm charts](./charts)
- install by [kubectl](./docs/install-blob-csi-driver.md)
- install open source CSI driver on following platforms:
Expand All @@ -62,6 +62,7 @@ This option does not depend on cloud provider config file, supports cross subscr
- [Basic usage](./deploy/example/e2e_usage.md)
- [NFSv3](./deploy/example/nfs)
- [fsGroupPolicy](./deploy/example/fsgroup)
- [Volume cloning](./deploy/example/cloning)
- [Workload identity](./docs/workload-identity.md)
### Troubleshooting
Expand Down
8 changes: 4 additions & 4 deletions charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

### Tips
- configure with [blobfuse-proxy](../deploy/blobfuse-proxy) to make blobfuse mount still available after driver restart
> note: [blobfuse-proxy](../deploy/blobfuse-proxy) is only available on **debian** OS based agent node (not available on OpenShift)
> Note: [blobfuse-proxy](../deploy/blobfuse-proxy) is supported on CoreOS(OpenShift) from v1.23.2
- specify `node.enableBlobfuseProxy=true` together with [blobfuse-proxy](../deploy/blobfuse-proxy)
- run controller on control plane node: `--set controller.runOnControlPlane=true`
- set replica of controller as `1`: `--set controller.replicas=1`
Expand Down Expand Up @@ -66,16 +66,16 @@ The following table lists the configurable parameters of the latest Azure Blob S
| `image.blob.tag` | blob-csi-driver docker image tag | `latest` |
| `image.blob.pullPolicy` | blob-csi-driver image pull policy | `IfNotPresent` |
| `image.csiProvisioner.repository` | csi-provisioner docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner` |
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.6.1` |
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.6.2` |
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
| `image.livenessProbe.repository` | liveness-probe docker image | `mcr.microsoft.com/oss/kubernetes-csi/livenessprobe` |
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.11.0` |
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.9.0` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.9.1` |
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
| `image.csiResizer.repository` | csi-resizer docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-resizer` |
| `image.csiResizer.tag` | csi-resizer docker image tag | `v1.9.1` |
| `image.csiResizer.tag` | csi-resizer docker image tag | `v1.9.2` |
| `image.csiResizer.pullPolicy` | csi-resizer image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) |
| `cloud` | the cloud environment the driver is running on | `AzurePublicCloud` |
Expand Down
Loading

0 comments on commit 384c2fb

Please sign in to comment.