Skip to content

Commit

Permalink
Merge pull request #118 from shiftstack/merge-bot-master
Browse files Browse the repository at this point in the history
  • Loading branch information
openshift-merge-robot committed Jun 21, 2023
2 parents 82f1a60 + 02ce99e commit c549431
Show file tree
Hide file tree
Showing 390 changed files with 16,948 additions and 5,556 deletions.
20 changes: 20 additions & 0 deletions .github/dependabot.yaml
@@ -0,0 +1,20 @@
version: 2
updates:
- package-ecosystem: gomod
directory: "/"
schedule:
interval: daily
labels:
- "area/dependency"
- "release-note-none"
- "ok-to-test"
open-pull-requests-limit: 1
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
labels:
- "area/dependency"
- "release-note-none"
- "ok-to-test"
open-pull-requests-limit: 1
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Set up Go 1.x
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ^1.18
id: go
Expand All @@ -48,7 +48,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -63,4 +63,4 @@ jobs:
make all
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Check for spelling errors
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: codespell-project/actions-codespell@master
with:
check_filenames: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/darwin.yaml
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: macos-latest
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ^1.16
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Run unit tests
run: |
go version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yaml
Expand Up @@ -11,13 +11,13 @@ jobs:
steps:

- name: Set up Go 1.x
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ^1.17
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build Test
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pluto.yaml
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

# https://pluto.docs.fairwinds.com/advanced/#display-options
- name: Download pluto
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yaml
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Shellcheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static.yaml
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ^1.19
- uses: actions/checkout@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yaml
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v3

- name: Install go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ^1.19

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yaml
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go }}
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Run Windows Unit Tests
run: |
go version
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Expand Up @@ -27,7 +27,7 @@ include release-tools/build.make

GIT_COMMIT = $(shell git rev-parse HEAD)
BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
IMAGE_VERSION ?= v4.2.0
IMAGE_VERSION ?= v4.4.0
LDFLAGS = -X ${PKG}/pkg/nfs.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/nfs.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/nfs.buildDate=${BUILD_DATE}
EXT_LDFLAGS = -s -w -extldflags "-static"
# Use a custom version for E2E tests if we are testing in CI
Expand Down Expand Up @@ -147,7 +147,6 @@ e2e-bootstrap: install-helm
OUTPUT_TYPE=registry $(MAKE) container push
helm install csi-driver-nfs ./charts/latest/csi-driver-nfs --namespace kube-system --wait --timeout=15m -v=5 --debug \
${E2E_HELM_OPTIONS} \
--set controller.dnsPolicy=ClusterFirstWithHostNet \
--set controller.logLevel=8 \
--set node.logLevel=8

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -12,9 +12,9 @@ This is a repository for [NFS](https://en.wikipedia.org/wiki/Network_File_System
|driver version | supported k8s version | status |
|----------------|-----------------------|--------|
|master branch | 1.21+ | GA |
|v4.4.0 | 1.21+ | GA |
|v4.3.0 | 1.21+ | GA |
|v4.2.0 | 1.21+ | GA |
|v4.1.0 | 1.20+ | GA |
|v4.0.0 | 1.20+ | GA |

### Install driver on a Kubernetes cluster
> [install NFS CSI driver on microk8s](https://microk8s.io/docs/nfs)
Expand Down
12 changes: 6 additions & 6 deletions charts/README.md
Expand Up @@ -15,7 +15,7 @@
### install a specific version
```console
helm repo add csi-driver-nfs https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.2.0
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.4.0
```

### install driver with customized driver name, deployment name
Expand Down Expand Up @@ -51,21 +51,21 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
| `image.nfs.tag` | csi-driver-nfs image tag | `latest` |
| `image.nfs.pullPolicy` | csi-driver-nfs image pull policy | `IfNotPresent` |
| `image.csiProvisioner.repository` | csi-provisioner docker image | `registry.k8s.io/sig-storage/csi-provisioner` |
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.3.0` |
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.5.0` |
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
| `image.livenessProbe.repository` | liveness-probe docker image | `registry.k8s.io/sig-storage/livenessprobe` |
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.8.0` |
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.10.0` |
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.6.2` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.8.0` |
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) |
| `serviceAccount.create` | whether create service account of csi-nfs-controller | `true` |
| `rbac.create` | whether create rbac of csi-nfs-controller | `true` |
| `controller.replicas` | replica number of csi-nfs-controller | `1` |
| `controller.runOnMaster` | run controller on master node(deprecated on k8s 1.25+) |`false` |
| `controller.runOnControlPlane` | run controller on control plane node |`false` |
| `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `Default` |
| `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `ClusterFirstWithHostNet` |
| `controller.defaultOnDeletePolicy` | default policy for deleting subdirectory when deleting a volume, available values: `delete`, `retain` | `delete` |
| `controller.logLevel` | controller driver log level |`5` |
| `controller.workingMountDir` | working directory for provisioner to mount nfs shares temporarily | `/tmp` |
Expand All @@ -82,7 +82,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
| `controller.resources.nfs.requests.cpu` | csi-driver-nfs cpu requests limits | 10m |
| `controller.resources.nfs.requests.memory` | csi-driver-nfs memory requests limits | 20Mi |
| `node.name` | driver node daemonset name | `csi-nfs-node`
| `node.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` |
| `node.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` |`ClusterFirstWithHostNet`
| `node.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1`
| `node.logLevel` | node driver log level |`5` |
| `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` |
Expand Down
36 changes: 27 additions & 9 deletions charts/index.yaml
@@ -1,9 +1,27 @@
apiVersion: v1
entries:
csi-driver-nfs:
- apiVersion: v1
appVersion: v4.4.0
created: "2023-06-07T08:29:18.915849236Z"
description: CSI NFS Driver for Kubernetes
digest: 8433b702987079bd2209921e22db7b038bfff760d50b85755e72684ee6c60721
name: csi-driver-nfs
urls:
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.4.0/csi-driver-nfs-v4.4.0.tgz
version: v4.4.0
- apiVersion: v1
appVersion: v4.3.0
created: "2023-06-07T08:29:18.915120822Z"
description: CSI NFS Driver for Kubernetes
digest: 1aef5dec52a6c433dbed2e361bed0ab1fdd6792f845eccb99b7dc7f193c2a71e
name: csi-driver-nfs
urls:
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.3.0/csi-driver-nfs-v4.3.0.tgz
version: v4.3.0
- apiVersion: v1
appVersion: v4.2.0
created: "2023-02-19T03:06:17.779651726Z"
created: "2023-06-07T08:29:18.91443514Z"
description: CSI NFS Driver for Kubernetes
digest: e702f6c9be35f2649f5736ca5fcdc40ab1c6a235f41e7fb2472d208e8a5ebf47
name: csi-driver-nfs
Expand All @@ -12,7 +30,7 @@ entries:
version: v4.2.0
- apiVersion: v1
appVersion: v4.1.0
created: "2023-02-19T03:06:17.779230713Z"
created: "2023-06-07T08:29:18.913997153Z"
description: CSI NFS Driver for Kubernetes
digest: b2baa2f129976cf2981c8873290aac509aa3c5937ffc319fbf69fbe3271c23eb
name: csi-driver-nfs
Expand All @@ -21,7 +39,7 @@ entries:
version: v4.1.0
- apiVersion: v1
appVersion: v4.0.0
created: "2023-02-19T03:06:17.778817545Z"
created: "2023-06-07T08:29:18.913508212Z"
description: CSI NFS Driver for Kubernetes
digest: 3145fd12225a639908b14675c8ae1f272bc0e57ffa2895b6f17411486a24229d
name: csi-driver-nfs
Expand All @@ -30,7 +48,7 @@ entries:
version: v4.0.0
- apiVersion: v1
appVersion: v3.1.0
created: "2023-02-19T03:06:17.778410591Z"
created: "2023-06-07T08:29:18.913089943Z"
description: CSI NFS Driver for Kubernetes
digest: 7e51bb9188b013195cafc265102fa365de9ec5513780e1dfc5363289f811a4d9
name: csi-driver-nfs
Expand All @@ -39,7 +57,7 @@ entries:
version: v3.1.0
- apiVersion: v1
appVersion: v3.0.0
created: "2023-02-19T03:06:17.778027388Z"
created: "2023-06-07T08:29:18.912648344Z"
description: CSI NFS Driver for Kubernetes
digest: 44406231cd5cdada1c62a0541b93b4f5d5a70ccc8c50b33553a8692fe6cfae96
name: csi-driver-nfs
Expand All @@ -48,7 +66,7 @@ entries:
version: v3.0.0
- apiVersion: v1
appVersion: v2.0.0
created: "2023-02-19T03:06:17.777605366Z"
created: "2023-06-07T08:29:18.911647961Z"
description: CSI NFS Driver for Kubernetes
digest: 1a32c6fc016526fe19a0c9e0dfbe83d0ddde67ced533bb5f5d24d713f706c613
name: csi-driver-nfs
Expand All @@ -57,11 +75,11 @@ entries:
version: v2.0.0
- apiVersion: v1
appVersion: latest
created: "2023-02-19T03:06:17.777385954Z"
created: "2023-06-07T08:29:18.91113186Z"
description: CSI NFS Driver for Kubernetes
digest: 16549e803dcdcf624e6dffeaff63cea7cfde0447651cc188060d5f2801f21c9f
digest: 7e41d0f60dce722ae616b9caf8999d8271750b1a762c809ef1929f57756d2f3f
name: csi-driver-nfs
urls:
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/latest/csi-driver-nfs-v0.0.0.tgz
version: v0.0.0
generated: "2023-02-19T03:06:17.776802428Z"
generated: "2023-06-07T08:29:18.910267239Z"
Binary file modified charts/latest/csi-driver-nfs-v0.0.0.tgz
Binary file not shown.

0 comments on commit c549431

Please sign in to comment.