Skip to content

Commit

Permalink
Merge pull request #133 from shiftstack/merge-upstream
Browse files Browse the repository at this point in the history 
OCPBUGS-21829: Merge upstream
  • Loading branch information
@openshift-ci
openshift-ci[bot] committed Oct 26, 2023
2 parents 143b5f1 + 566fcd0 commit 8e85ebf
Show file tree
Hide file tree
Showing 1,602 changed files with 215,118 additions and 80,859 deletions.
1 change: 1 addition & 0 deletions charts/README.md
View file
Expand Up @@ -47,6 +47,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
| `driver.mountPermissions` | default mounted folder permissions | `0`
| `feature.enableFSGroupPolicy` | enable [`fsGroupPolicy`](https://kubernetes.io/blog/2020/12/14/kubernetes-release-1.20-fsgroupchangepolicy-fsgrouppolicy/#allow-csi-drivers-to-declare-support-for-fsgroup-based-permissions) on a k8s 1.20+ cluster | `true` |
| `feature.enableInlineVolume` | enable inline volume | `false` |
| `feature.propagateHostMountOptions` | use the default host NFS mount configuration file [`/etc/nfsmount.conf`](https://man7.org/linux/man-pages/man5/nfsmount.conf.5.html) and/or the default host `/etc/nfsmount.d` mount configuration directory as source for mount options | `false` |
| `kubeletDir` | alternative kubelet directory | `/var/lib/kubelet` |
| `image.nfs.repository` | csi-driver-nfs image | `registry.k8s.io/sig-storage/nfsplugin` |
| `image.nfs.tag` | csi-driver-nfs image tag | `latest` |
Expand Down
Binary file modified charts/latest/csi-driver-nfs-v0.0.0.tgz
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
View file
Expand Up @@ -56,6 +56,7 @@ spec:
- "--leader-election"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "--extra-create-metadata=true"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand All @@ -73,6 +74,7 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "--leader-election"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand Down
16 changes: 16 additions & 0 deletions charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml
View file
Expand Up @@ -125,6 +125,12 @@ spec:
- name: pods-mount-dir
mountPath: {{ .Values.kubeletDir }}/pods
mountPropagation: "Bidirectional"
{{- if .Values.feature.propagateHostMountOptions }}
- name: host-nfsmount-conf
mountPath: /etc/nfsmount.conf
- name: host-nfsmount-conf-d
mountPath: /etc/nfsmount.conf.d
{{- end }}
resources: {{- toYaml .Values.node.resources.nfs | nindent 12 }}
volumes:
- name: socket-dir
Expand All @@ -139,3 +145,13 @@ spec:
path: {{ .Values.kubeletDir }}/plugins_registry
type: Directory
name: registration-dir
{{- if .Values.feature.propagateHostMountOptions }}
- hostPath:
path: /etc/nfsmount.conf
type: FileOrCreate
name: host-nfsmount-conf
- hostPath:
path: /etc/nfsmount.conf.d
type: DirectoryOrCreate
name: host-nfsmount-conf-d
{{- end }}
1 change: 1 addition & 0 deletions charts/latest/csi-driver-nfs/values.yaml
View file
Expand Up @@ -41,6 +41,7 @@ driver:
feature:
enableFSGroupPolicy: true
enableInlineVolume: false
propagateHostMountOptions: false

kubeletDir: /var/lib/kubelet

Expand Down
Binary file modified charts/v4.4.0/csi-driver-nfs-v4.4.0.tgz
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions charts/v4.4.0/csi-driver-nfs/templates/csi-nfs-controller.yaml
View file
Expand Up @@ -56,6 +56,7 @@ spec:
- "--leader-election"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "--extra-create-metadata=true"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand All @@ -73,6 +74,7 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--leader-election-namespace={{ .Release.Namespace }}"
- "--leader-election"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand Down
5 changes: 1 addition & 4 deletions cmd/nfsplugin/main.go
View file
Expand Up @@ -34,12 +34,9 @@ var (
defaultOnDeletePolicy = flag.String("default-ondelete-policy", "", "default policy for deleting subdirectory when deleting a volume")
)

func init() {
_ = flag.Set("logtostderr", "true")
}

func main() {
klog.InitFlags(nil)
_ = flag.Set("logtostderr", "true")
flag.Parse()
if *nodeID == "" {
klog.Warning("nodeid is empty")
Expand Down
2 changes: 2 additions & 0 deletions deploy/csi-nfs-controller.yaml
View file
Expand Up @@ -42,6 +42,7 @@ spec:
- "--leader-election"
- "--leader-election-namespace=kube-system"
- "--extra-create-metadata=true"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand All @@ -61,6 +62,7 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--leader-election-namespace=kube-system"
- "--leader-election"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand Down
2 changes: 2 additions & 0 deletions deploy/v4.4.0/csi-nfs-controller.yaml
View file
Expand Up @@ -42,6 +42,7 @@ spec:
- "--leader-election"
- "--leader-election-namespace=kube-system"
- "--extra-create-metadata=true"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand All @@ -61,6 +62,7 @@ spec:
- "--csi-address=$(ADDRESS)"
- "--leader-election-namespace=kube-system"
- "--leader-election"
- "--timeout=1200s"
env:
- name: ADDRESS
value: /csi/csi.sock
Expand Down
2 changes: 1 addition & 1 deletion docs/csi-dev.md
View file
Expand Up @@ -97,7 +97,7 @@ export REGISTRY=<dockerhub-alias>
export IMAGE_VERSION=latest
```

- Build continer image and push image to dockerhub
- Build container image and push image to dockerhub
```console
# run `docker login` first
# build docker image
Expand Down
151 changes: 75 additions & 76 deletions go.mod
View file
@@ -1,139 +1,138 @@
module github.com/kubernetes-csi/csi-driver-nfs

go 1.19
go 1.20

require (
github.com/container-storage-interface/spec v1.8.0
github.com/golang/protobuf v1.5.3
github.com/kubernetes-csi/csi-lib-utils v0.9.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.10
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.28.0
github.com/pborman/uuid v1.2.1
github.com/stretchr/testify v1.8.4
golang.org/x/net v0.17.0
google.golang.org/grpc v1.57.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
k8s.io/api v0.24.15
k8s.io/apimachinery v0.24.15
k8s.io/client-go v0.24.15
k8s.io/api v0.26.9
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.26.9
k8s.io/klog/v2 v2.100.1
k8s.io/kubernetes v1.24.15
k8s.io/mount-utils v0.24.15
k8s.io/kubernetes v1.26.9
k8s.io/mount-utils v0.26.9
k8s.io/pod-security-admission v0.0.0
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/aws/aws-sdk-go v1.38.49 // indirect
github.com/aws/aws-sdk-go v1.44.116 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/cobra v1.4.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
k8s.io/apiserver v0.24.15 // indirect
k8s.io/cloud-provider v0.24.15 // indirect
k8s.io/component-base v0.24.15 // indirect
k8s.io/component-helpers v0.24.15 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/apiserver v0.28.3 // indirect
k8s.io/cloud-provider v0.26.9 // indirect
k8s.io/component-base v0.26.9 // indirect
k8s.io/component-helpers v0.26.9 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.24.15
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.15
k8s.io/apimachinery => k8s.io/apimachinery v0.24.15
k8s.io/apiserver => k8s.io/apiserver v0.24.15
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.15
k8s.io/client-go => k8s.io/client-go v0.24.15
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.15
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.15
k8s.io/code-generator => k8s.io/code-generator v0.24.15
k8s.io/component-base => k8s.io/component-base v0.24.15
k8s.io/component-helpers => k8s.io/component-helpers v0.24.15
k8s.io/controller-manager => k8s.io/controller-manager v0.24.15
k8s.io/cri-api => k8s.io/cri-api v0.24.15
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.15
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.15
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.15
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.15
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.15
k8s.io/kubectl => k8s.io/kubectl v0.24.15
k8s.io/kubelet => k8s.io/kubelet v0.24.15
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.15
k8s.io/metrics => k8s.io/metrics v0.24.15
k8s.io/api => k8s.io/api v0.26.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.9
k8s.io/apimachinery => k8s.io/apimachinery v0.26.9
k8s.io/apiserver => k8s.io/apiserver v0.26.9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.9
k8s.io/client-go => k8s.io/client-go v0.26.9
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.9
k8s.io/code-generator => k8s.io/code-generator v0.26.9
k8s.io/component-base => k8s.io/component-base v0.26.9
k8s.io/component-helpers => k8s.io/component-helpers v0.26.9
k8s.io/controller-manager => k8s.io/controller-manager v0.26.9
k8s.io/cri-api => k8s.io/cri-api v0.26.9
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.9
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.9
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.9
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.9
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.9
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.9
k8s.io/kubectl => k8s.io/kubectl v0.26.9
k8s.io/kubelet => k8s.io/kubelet v0.26.9
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.9
k8s.io/metrics => k8s.io/metrics v0.26.9
k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20230103133730-1df1a57439e2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.15
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.15
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.15
k8s.io/sample-controller => k8s.io/sample-controller v0.24.15
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.9
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.9
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.9
k8s.io/sample-controller => k8s.io/sample-controller v0.26.9
)

0 comments on commit 8e85ebf

Please sign in to comment.