Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…ster
  • Loading branch information
shiftstack-merge-bot committed Nov 13, 2023
2 parents 8e85ebf + 87c3b51 commit bfbb411
Show file tree
Hide file tree
Showing 504 changed files with 14,668 additions and 1,111 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM registry.k8s.io/build-image/debian-base:bullseye-v1.4.3
FROM registry.k8s.io/build-image/debian-base:bookworm-v1.0.0

ARG ARCH
ARG binary=./bin/${ARCH}/nfsplugin
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
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.4.0
IMAGE_VERSION ?= v4.6.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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
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.5.0 | 1.21+ | GA |
|v4.4.0 | 1.21+ | GA |
|v4.3.0 | 1.21+ | GA |
|v4.2.0 | 1.21+ | GA |

### Install driver on a Kubernetes cluster
> [install NFS CSI driver on microk8s](https://microk8s.io/docs/nfs)
Expand Down
16 changes: 8 additions & 8 deletions charts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
- install csi snapshot controller: `--set externalSnapshotter.enabled=true`
- run controller on control plane node: `--set controller.runOnControlPlane=true`
- set replica of controller as `2`: `--set controller.replicas=2`
- Microk8s based kubernetes recommended settings:
- `--set linux.dnsPolicy=ClusterFirstWithHostNet` with `--set controller.dnsPolicy=ClusterFirstWithHostNet` -
- Microk8s based kubernetes recommended settings(refer to https://microk8s.io/docs/nfs):
- `--set controller.dnsPolicy=ClusterFirstWithHostNet` with `--set node.dnsPolicy=ClusterFirstWithHostNet` -
external smb server cannot be found based on Default dns.
- `--set linux.kubelet="/var/snap/microk8s/common/var/lib/kubelet"` - sets correct path to microk8s kubelet even
- `--set kubeletDir="/var/snap/microk8s/common/var/lib/kubelet"` - sets correct path to microk8s kubelet even
though a user has a folder link to it.

### 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.4.0
helm install csi-driver-nfs csi-driver-nfs/csi-driver-nfs --namespace kube-system --version v4.5.0
```

### install driver with customized driver name, deployment name
Expand Down Expand Up @@ -53,13 +53,13 @@ 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.5.0` |
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.6.1` |
| `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.10.0` |
| `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 | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.8.0` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.9.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` |
Expand All @@ -68,7 +68,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
| `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` | `ClusterFirstWithHostNet` |
| `controller.defaultOnDeletePolicy` | default policy for deleting subdirectory when deleting a volume, available values: `delete`, `retain` | `delete` |
| `controller.defaultOnDeletePolicy` | default policy for deleting subdirectory when deleting a volume, available values: `delete`, `retain`, `archive` | `delete` |
| `controller.logLevel` | controller driver log level |`5` |
| `controller.workingMountDir` | working directory for provisioner to mount nfs shares temporarily | `/tmp` |
| `controller.affinity` | controller pod affinity | `{}` |
Expand Down
33 changes: 21 additions & 12 deletions charts/index.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
apiVersion: v1
entries:
csi-driver-nfs:
- apiVersion: v1
appVersion: v4.5.0
created: "2023-11-09T08:12:07.097560158Z"
description: CSI NFS Driver for Kubernetes
digest: 662f6db409ac14747c72a9fb2955dedc9ade46497704cab3dd0c472f7d56d58f
name: csi-driver-nfs
urls:
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts/v4.5.0/csi-driver-nfs-v4.5.0.tgz
version: v4.5.0
- apiVersion: v1
appVersion: v4.4.0
created: "2023-06-07T08:29:18.915849236Z"
created: "2023-11-09T08:12:07.096855523Z"
description: CSI NFS Driver for Kubernetes
digest: 8433b702987079bd2209921e22db7b038bfff760d50b85755e72684ee6c60721
digest: 7fba8cbfc47036a0fddadad00ee291c625e359fe1483ef37b57fd09d157c80dd
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"
created: "2023-11-09T08:12:07.096136236Z"
description: CSI NFS Driver for Kubernetes
digest: 1aef5dec52a6c433dbed2e361bed0ab1fdd6792f845eccb99b7dc7f193c2a71e
name: csi-driver-nfs
Expand All @@ -21,7 +30,7 @@ entries:
version: v4.3.0
- apiVersion: v1
appVersion: v4.2.0
created: "2023-06-07T08:29:18.91443514Z"
created: "2023-11-09T08:12:07.0954294Z"
description: CSI NFS Driver for Kubernetes
digest: e702f6c9be35f2649f5736ca5fcdc40ab1c6a235f41e7fb2472d208e8a5ebf47
name: csi-driver-nfs
Expand All @@ -30,7 +39,7 @@ entries:
version: v4.2.0
- apiVersion: v1
appVersion: v4.1.0
created: "2023-06-07T08:29:18.913997153Z"
created: "2023-11-09T08:12:07.094985076Z"
description: CSI NFS Driver for Kubernetes
digest: b2baa2f129976cf2981c8873290aac509aa3c5937ffc319fbf69fbe3271c23eb
name: csi-driver-nfs
Expand All @@ -39,7 +48,7 @@ entries:
version: v4.1.0
- apiVersion: v1
appVersion: v4.0.0
created: "2023-06-07T08:29:18.913508212Z"
created: "2023-11-09T08:12:07.094556129Z"
description: CSI NFS Driver for Kubernetes
digest: 3145fd12225a639908b14675c8ae1f272bc0e57ffa2895b6f17411486a24229d
name: csi-driver-nfs
Expand All @@ -48,7 +57,7 @@ entries:
version: v4.0.0
- apiVersion: v1
appVersion: v3.1.0
created: "2023-06-07T08:29:18.913089943Z"
created: "2023-11-09T08:12:07.094116135Z"
description: CSI NFS Driver for Kubernetes
digest: 7e51bb9188b013195cafc265102fa365de9ec5513780e1dfc5363289f811a4d9
name: csi-driver-nfs
Expand All @@ -57,7 +66,7 @@ entries:
version: v3.1.0
- apiVersion: v1
appVersion: v3.0.0
created: "2023-06-07T08:29:18.912648344Z"
created: "2023-11-09T08:12:07.093671427Z"
description: CSI NFS Driver for Kubernetes
digest: 44406231cd5cdada1c62a0541b93b4f5d5a70ccc8c50b33553a8692fe6cfae96
name: csi-driver-nfs
Expand All @@ -66,7 +75,7 @@ entries:
version: v3.0.0
- apiVersion: v1
appVersion: v2.0.0
created: "2023-06-07T08:29:18.911647961Z"
created: "2023-11-09T08:12:07.093194646Z"
description: CSI NFS Driver for Kubernetes
digest: 1a32c6fc016526fe19a0c9e0dfbe83d0ddde67ced533bb5f5d24d713f706c613
name: csi-driver-nfs
Expand All @@ -75,11 +84,11 @@ entries:
version: v2.0.0
- apiVersion: v1
appVersion: latest
created: "2023-06-07T08:29:18.91113186Z"
created: "2023-11-09T08:12:07.09290472Z"
description: CSI NFS Driver for Kubernetes
digest: 7e41d0f60dce722ae616b9caf8999d8271750b1a762c809ef1929f57756d2f3f
digest: cfb0d61fdf006902eaf71916479828f267d8cbe8fe0ff3c6711dda6aa2c018be
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-06-07T08:29:18.910267239Z"
generated: "2023-11-09T08:12:07.091244313Z"
Binary file modified charts/latest/csi-driver-nfs-v0.0.0.tgz
Binary file not shown.
10 changes: 5 additions & 5 deletions charts/latest/csi-driver-nfs/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ image:
pullPolicy: IfNotPresent
csiProvisioner:
repository: registry.k8s.io/sig-storage/csi-provisioner
tag: v3.5.0
tag: v3.6.1
pullPolicy: IfNotPresent
csiSnapshotter:
repository: registry.k8s.io/sig-storage/csi-snapshotter
tag: v6.2.2
tag: v6.3.1
pullPolicy: IfNotPresent
livenessProbe:
repository: registry.k8s.io/sig-storage/livenessprobe
tag: v2.10.0
tag: v2.11.0
pullPolicy: IfNotPresent
nodeDriverRegistrar:
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
tag: v2.8.0
tag: v2.9.0
pullPolicy: IfNotPresent
externalSnapshotter:
repository: registry.k8s.io/sig-storage/snapshot-controller
tag: v6.2.2
tag: v6.3.1
pullPolicy: IfNotPresent

serviceAccount:
Expand Down
Binary file added charts/v4.5.0/csi-driver-nfs-v4.5.0.tgz
Binary file not shown.
22 changes: 22 additions & 0 deletions charts/v4.5.0/csi-driver-nfs/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
5 changes: 5 additions & 0 deletions charts/v4.5.0/csi-driver-nfs/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: v1
appVersion: v4.5.0
description: CSI NFS Driver for Kubernetes
name: csi-driver-nfs
version: v4.5.0
5 changes: 5 additions & 0 deletions charts/v4.5.0/csi-driver-nfs/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The CSI NFS Driver is getting deployed to your cluster.

To check CSI NFS Driver pods status, please run:

kubectl --namespace={{ .Release.Namespace }} get pods --selector="app.kubernetes.io/instance={{ .Release.Name }}" --watch
19 changes: 19 additions & 0 deletions charts/v4.5.0/csi-driver-nfs/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{/* vim: set filetype=mustache: */}}

{{/* Expand the name of the chart.*/}}
{{- define "nfs.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/* labels for helm resources */}}
{{- define "nfs.labels" -}}
labels:
app.kubernetes.io/instance: "{{ .Release.Name }}"
app.kubernetes.io/managed-by: "{{ .Release.Service }}"
app.kubernetes.io/name: "{{ template "nfs.name" . }}"
app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- if .Values.customLabels }}
{{ toYaml .Values.customLabels | indent 2 -}}
{{- end }}
{{- end -}}

0 comments on commit bfbb411

Please sign in to comment.