Skip to content

Commit 406cec7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request openshift#139 from shiftstack/merge-bot-master
OCPBUGS-30439: Merge https://github.com/kubernetes-csi/csi-driver-nfs:master into master
2 parents f7215a8 + 48c5de8 commit 406cec7

File tree

110 files changed

+3432
-2546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+3432
-2546
lines changed

‎.github/workflows/linux.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ jobs:
2424
go version
2525
export PATH=$PATH:$HOME/.local/bin
2626
make verify
27-
go test -covermode=count -coverprofile=profile.cov ./pkg/...
27+
go test -race -covermode=atomic -coverprofile=profile.cov ./pkg/...
2828
export DOCKER_CLI_EXPERIMENTAL=enabled && make container
2929
30+
- name: Install goveralls
31+
run: go install github.com/mattn/goveralls@latest
32+
3033
- name: Send coverage
3134
env:
3235
COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33-
run: |
34-
GO111MODULE=off go get github.com/mattn/goveralls
35-
$(go env GOPATH)/bin/goveralls -coverprofile=profile.cov -service=github
36+
run: goveralls -coverprofile=profile.cov -service=github

‎Makefile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ include release-tools/build.make
2727

2828
GIT_COMMIT = $(shell git rev-parse HEAD)
2929
BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
30-
IMAGE_VERSION ?= v4.6.0
30+
IMAGE_VERSION ?= v4.7.0
3131
LDFLAGS = -X ${PKG}/pkg/nfs.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/nfs.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/nfs.buildDate=${BUILD_DATE}
3232
EXT_LDFLAGS = -s -w -extldflags "-static"
3333
# Use a custom version for E2E tests if we are testing in CI
@@ -67,10 +67,6 @@ unit-test:
6767
sanity-test: nfs
6868
./test/sanity/run-test.sh
6969

70-
.PHONY: integration-test
71-
integration-test: nfs
72-
./test/integration/run-test.sh
73-
7470
.PHONY: local-build-push
7571
local-build-push: nfs
7672
docker build -t $(LOCAL_USER)/nfsplugin:latest .

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This is a repository for [NFS](https://en.wikipedia.org/wiki/Network_File_System
1818
|v4.4.0 | 1.21+ | GA |
1919

2020
### Install driver on a Kubernetes cluster
21-
> [install NFS CSI driver on microk8s](https://microk8s.io/docs/nfs)
21+
> [install NFS CSI driver on microk8s](https://microk8s.io/docs/how-to-nfs)
2222
- install via [helm charts](./charts)
2323
- install via [kubectl](./docs/install-nfs-csi-driver.md)
2424

‎charts/latest/csi-driver-nfs-v0.0.0.tgz‎

-15 Bytes
Binary file not shown.

‎charts/latest/csi-driver-nfs/templates/rbac-csi-nfs.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ rules:
3232
- apiGroups: ["storage.k8s.io"]
3333
resources: ["storageclasses"]
3434
verbs: ["get", "list", "watch"]
35-
{{- if .Values.externalSnapshotter.enabled }}
3635
- apiGroups: ["snapshot.storage.k8s.io"]
3736
resources: ["volumesnapshotclasses", "volumesnapshots"]
3837
verbs: ["get", "list", "watch"]
@@ -42,7 +41,6 @@ rules:
4241
- apiGroups: ["snapshot.storage.k8s.io"]
4342
resources: ["volumesnapshotcontents/status"]
4443
verbs: ["get", "update", "patch"]
45-
{{- end }}
4644
- apiGroups: [""]
4745
resources: ["events"]
4846
verbs: ["get", "list", "watch", "create", "update", "patch"]

‎charts/v4.5.0/csi-driver-nfs-v4.5.0.tgz‎

-13 Bytes
Binary file not shown.

‎charts/v4.5.0/csi-driver-nfs/templates/rbac-csi-nfs.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ rules:
3232
- apiGroups: ["storage.k8s.io"]
3333
resources: ["storageclasses"]
3434
verbs: ["get", "list", "watch"]
35-
{{- if .Values.externalSnapshotter.enabled }}
3635
- apiGroups: ["snapshot.storage.k8s.io"]
3736
resources: ["volumesnapshotclasses", "volumesnapshots"]
3837
verbs: ["get", "list", "watch"]
@@ -42,7 +41,6 @@ rules:
4241
- apiGroups: ["snapshot.storage.k8s.io"]
4342
resources: ["volumesnapshotcontents/status"]
4443
verbs: ["get", "update", "patch"]
45-
{{- end }}
4644
- apiGroups: [""]
4745
resources: ["events"]
4846
verbs: ["get", "list", "watch", "create", "update", "patch"]

‎charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz‎

-13 Bytes
Binary file not shown.

‎charts/v4.6.0/csi-driver-nfs/templates/rbac-csi-nfs.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ rules:
3232
- apiGroups: ["storage.k8s.io"]
3333
resources: ["storageclasses"]
3434
verbs: ["get", "list", "watch"]
35-
{{- if .Values.externalSnapshotter.enabled }}
3635
- apiGroups: ["snapshot.storage.k8s.io"]
3736
resources: ["volumesnapshotclasses", "volumesnapshots"]
3837
verbs: ["get", "list", "watch"]
@@ -42,7 +41,6 @@ rules:
4241
- apiGroups: ["snapshot.storage.k8s.io"]
4342
resources: ["volumesnapshotcontents/status"]
4443
verbs: ["get", "update", "patch"]
45-
{{- end }}
4644
- apiGroups: [""]
4745
resources: ["events"]
4846
verbs: ["get", "list", "watch", "create", "update", "patch"]

‎go.mod‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@ go 1.21
44

55
require (
66
github.com/container-storage-interface/spec v1.8.0
7-
github.com/golang/protobuf v1.5.3
87
github.com/kubernetes-csi/csi-lib-utils v0.9.0
9-
github.com/onsi/ginkgo/v2 v2.15.0
8+
github.com/onsi/ginkgo/v2 v2.17.0
109
github.com/onsi/gomega v1.31.1
1110
github.com/pborman/uuid v1.2.1
12-
github.com/stretchr/testify v1.8.4
13-
golang.org/x/net v0.21.0
14-
google.golang.org/grpc v1.61.0
15-
google.golang.org/protobuf v1.32.0
16-
k8s.io/api v0.28.6
17-
k8s.io/apimachinery v0.28.6
18-
k8s.io/client-go v0.28.6
11+
github.com/stretchr/testify v1.9.0
12+
golang.org/x/net v0.22.0
13+
google.golang.org/grpc v1.62.1
14+
google.golang.org/protobuf v1.33.0
15+
k8s.io/api v0.28.8
16+
k8s.io/apimachinery v0.28.8
17+
k8s.io/client-go v0.28.8
1918
k8s.io/klog/v2 v2.120.1
20-
k8s.io/kubernetes v1.28.6
21-
k8s.io/mount-utils v0.29.1
19+
k8s.io/kubernetes v1.28.7
20+
k8s.io/mount-utils v0.29.2
2221
k8s.io/pod-security-admission v0.0.0
2322
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2423
sigs.k8s.io/cloud-provider-azure v1.28.4
@@ -49,12 +48,13 @@ require (
4948
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5049
github.com/gogo/protobuf v1.3.2 // indirect
5150
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
51+
github.com/golang/protobuf v1.5.4 // indirect
5252
github.com/google/cel-go v0.16.1 // indirect
5353
github.com/google/gnostic-models v0.6.8 // indirect
5454
github.com/google/go-cmp v0.6.0 // indirect
5555
github.com/google/gofuzz v1.2.0 // indirect
5656
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
57-
github.com/google/uuid v1.4.0 // indirect
57+
github.com/google/uuid v1.6.0 // indirect
5858
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5959
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
6060
github.com/imdario/mergo v0.3.6 // indirect
@@ -94,19 +94,19 @@ require (
9494
go.uber.org/atomic v1.10.0 // indirect
9595
go.uber.org/multierr v1.11.0 // indirect
9696
go.uber.org/zap v1.19.0 // indirect
97-
golang.org/x/crypto v0.19.0 // indirect
97+
golang.org/x/crypto v0.21.0 // indirect
9898
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
99-
golang.org/x/oauth2 v0.14.0 // indirect
100-
golang.org/x/sync v0.5.0 // indirect
101-
golang.org/x/sys v0.17.0 // indirect
102-
golang.org/x/term v0.17.0 // indirect
99+
golang.org/x/oauth2 v0.16.0 // indirect
100+
golang.org/x/sync v0.6.0 // indirect
101+
golang.org/x/sys v0.18.0 // indirect
102+
golang.org/x/term v0.18.0 // indirect
103103
golang.org/x/text v0.14.0 // indirect
104104
golang.org/x/time v0.3.0 // indirect
105-
golang.org/x/tools v0.16.1 // indirect
105+
golang.org/x/tools v0.17.0 // indirect
106106
google.golang.org/appengine v1.6.8 // indirect
107-
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
108-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
109-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
107+
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
108+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
109+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
110110
gopkg.in/inf.v0 v0.9.1 // indirect
111111
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
112112
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)