From 5eb0c58caa86a5815e218a0a32d58e504e1b654a Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Mon, 2 Jul 2018 23:34:41 +0200 Subject: [PATCH 01/19] Add nfs-client-provisioner chart --- incubator/nfs-client-provisioner/.helmignore | 21 +++++++ incubator/nfs-client-provisioner/Chart.yaml | 14 +++++ incubator/nfs-client-provisioner/README.md | 57 +++++++++++++++++++ .../templates/_helpers.tpl | 32 +++++++++++ .../templates/clusterrole.yaml | 21 +++++++ .../templates/clusterrolebinding.yaml | 16 ++++++ .../templates/deployment.yaml | 42 ++++++++++++++ .../templates/serviceaccount.yaml | 10 ++++ .../templates/storageclass.yaml | 15 +++++ incubator/nfs-client-provisioner/values.yaml | 52 +++++++++++++++++ 10 files changed, 280 insertions(+) create mode 100644 incubator/nfs-client-provisioner/.helmignore create mode 100644 incubator/nfs-client-provisioner/Chart.yaml create mode 100644 incubator/nfs-client-provisioner/README.md create mode 100644 incubator/nfs-client-provisioner/templates/_helpers.tpl create mode 100644 incubator/nfs-client-provisioner/templates/clusterrole.yaml create mode 100644 incubator/nfs-client-provisioner/templates/clusterrolebinding.yaml create mode 100644 incubator/nfs-client-provisioner/templates/deployment.yaml create mode 100644 incubator/nfs-client-provisioner/templates/serviceaccount.yaml create mode 100644 incubator/nfs-client-provisioner/templates/storageclass.yaml create mode 100644 incubator/nfs-client-provisioner/values.yaml diff --git a/incubator/nfs-client-provisioner/.helmignore b/incubator/nfs-client-provisioner/.helmignore new file mode 100644 index 000000000000..f0c131944441 --- /dev/null +++ b/incubator/nfs-client-provisioner/.helmignore @@ -0,0 +1,21 @@ +# 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 diff --git a/incubator/nfs-client-provisioner/Chart.yaml b/incubator/nfs-client-provisioner/Chart.yaml new file mode 100644 index 000000000000..4afccd8b479c --- /dev/null +++ b/incubator/nfs-client-provisioner/Chart.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +appVersion: 2.1.1 +description: nfs-client is an automatic provisioner that used your *already configured* NFS server, automatically creating Persistent Volumes. +name: nfs-client-provisioner +home: https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client +version: 0.1.0 +sources: +- https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client +maintainers: +- name: verwilst + email: bart@verwilst.be +keywords: +- nfs +- storage diff --git a/incubator/nfs-client-provisioner/README.md b/incubator/nfs-client-provisioner/README.md new file mode 100644 index 000000000000..f09a9b651e85 --- /dev/null +++ b/incubator/nfs-client-provisioner/README.md @@ -0,0 +1,57 @@ +# nfs-client-provisioner + +The [NFS client provisioner](https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client) is an automatic provisioner for Kubernetes that uses your *already configured* NFS server, automatically creating Persistent Volumes. + +## TL;DR; + +```console +$ helm install incubator/nfs-client-provisioner +``` + +## Introduction + +This charts installs custom [storage class](https://kubernetes.io/docs/concepts/storage/storage-classes/) into a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. It also installs a [NFS client provisioner](https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client) into the cluster which dynamically creates persistent volumes from single NFS share. + +## Prerequisites + +- Kubernetes 1.7+ +- Existing NFS Share + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```console +$ helm install --name my-release --set nfs.server=x.x.x.x --set nfs.path=/exported/path incubator/nfs-client-provisioner +``` + +The command deploys the given storage class in the default configuration. It can be used afterswards to provision persistent volumes. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +> **Tip**: List all releases using `helm list` + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```console +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The following tables lists the configurable parameters of this chart and their default values. + +| Parameter | Description | Default | +| --------------------------------- | ------------------------------------- | --------------------------------------------------------- | +| `replicaCount` | number of provisioner instances to deployed | 1 | +| `strategyType` | specifies the strategy used to replace old Pods by new ones | Recreate | +| `image.repository` | provisioner image | `quay.io/external_storage/nfs-client-provisioner` | +| `image.tag` | version of provisioner image | `v2.1.1-k8s1.10` | +| `image.pullPolicy` | image pull policy | `IfNotPresent` | +| `storageclass.nane` | name of the storageclass | `nfs-client` | +| `nfs.provisionerName` | name of the provisionerName | `fuseim.pri/ifs` | +| `nfs.server` | hostname of the NFS server | null (ip or hostname) | +| `nfs.path` | basepath of the mount point to be used | `/ifs/kubernetes` | +| `resources` | Resources required (e.g. CPU, memory) | `{}` | diff --git a/incubator/nfs-client-provisioner/templates/_helpers.tpl b/incubator/nfs-client-provisioner/templates/_helpers.tpl new file mode 100644 index 000000000000..9bcc3a23f8b4 --- /dev/null +++ b/incubator/nfs-client-provisioner/templates/_helpers.tpl @@ -0,0 +1,32 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "nfs-client-provisioner.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "nfs-client-provisioner.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "nfs-client-provisioner.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} diff --git a/incubator/nfs-client-provisioner/templates/clusterrole.yaml b/incubator/nfs-client-provisioner/templates/clusterrole.yaml new file mode 100644 index 000000000000..1992fc706113 --- /dev/null +++ b/incubator/nfs-client-provisioner/templates/clusterrole.yaml @@ -0,0 +1,21 @@ +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + labels: + app: {{ template "nfs-client-provisioner.name" . }} + chart: {{ template "nfs-client-provisioner.chart" . }} + release: {{ .Release.Name }} + name: {{ template "nfs-client-provisioner.name" . }}-runner +rules: + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["get", "list", "watch", "create", "delete"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["events"] + verbs: ["list", "watch", "create", "update", "patch"] diff --git a/incubator/nfs-client-provisioner/templates/clusterrolebinding.yaml b/incubator/nfs-client-provisioner/templates/clusterrolebinding.yaml new file mode 100644 index 000000000000..020f72ebb4f9 --- /dev/null +++ b/incubator/nfs-client-provisioner/templates/clusterrolebinding.yaml @@ -0,0 +1,16 @@ +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + labels: + app: {{ template "nfs-client-provisioner.name" . }} + chart: {{ template "nfs-client-provisioner.chart" . }} + release: {{ .Release.Name }} + name: run-{{ template "nfs-client-provisioner.name" . }} +subjects: + - kind: ServiceAccount + name: {{ template "nfs-client-provisioner.name" . }} + namespace: {{ .Release.Namespace }} +roleRef: + kind: ClusterRole + name: {{ template "nfs-client-provisioner.name" . }}-runner + apiGroup: rbac.authorization.k8s.io diff --git a/incubator/nfs-client-provisioner/templates/deployment.yaml b/incubator/nfs-client-provisioner/templates/deployment.yaml new file mode 100644 index 000000000000..58714244a955 --- /dev/null +++ b/incubator/nfs-client-provisioner/templates/deployment.yaml @@ -0,0 +1,42 @@ +apiVersion: apps/v1beta2 +kind: Deployment +metadata: + name: {{ template "nfs-client-provisioner.fullname" . }} + labels: + app: {{ template "nfs-client-provisioner.name" . }} + chart: {{ template "nfs-client-provisioner.chart" . }} + release: {{ .Release.Name }} +spec: + replicas: {{ .Values.replicaCount }} + strategy: + type: {{ .Values.strategyType }} + selector: + matchLabels: + app: {{ template "nfs-client-provisioner.name" . }} + release: {{ .Release.Name }} + template: + metadata: + labels: + app: {{ template "nfs-client-provisioner.name" . }} + release: {{ .Release.Name }} + spec: + serviceAccountName: {{ if .Values.rbac.create }}{{ template "nfs-client-provisioner.fullname" . }}{{ else }}{{ .Values.rbac.serviceAccountName | quote }}{{ end }} + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + volumeMounts: + - name: nfs-client-root + mountPath: /persistentvolumes + env: + - name: PROVISIONER_NAME + value: {{ .Values.storageClass.provisionerName }} + - name: NFS_SERVER + value: {{ .Values.nfs.server }} + - name: NFS_PATH + value: {{ .Values.nfs.path }} + volumes: + - name: nfs-client-root + nfs: + server: {{ .Values.nfs.server }} + path: {{ .Values.nfs.path }} diff --git a/incubator/nfs-client-provisioner/templates/serviceaccount.yaml b/incubator/nfs-client-provisioner/templates/serviceaccount.yaml new file mode 100644 index 000000000000..3f8b8e696f21 --- /dev/null +++ b/incubator/nfs-client-provisioner/templates/serviceaccount.yaml @@ -0,0 +1,10 @@ +{{- if .Values.rbac.create }} +apiVersion: v1 +kind: ServiceAccount +metadata: + labels: + app: {{ template "nfs-client-provisioner.name" . }} + chart: {{ template "nfs-client-provisioner.chart" . }} + release: {{ .Release.Name }} + name: {{ template "nfs-client-provisioner.name" . }} +{{- end -}} diff --git a/incubator/nfs-client-provisioner/templates/storageclass.yaml b/incubator/nfs-client-provisioner/templates/storageclass.yaml new file mode 100644 index 000000000000..85ae9bf00f34 --- /dev/null +++ b/incubator/nfs-client-provisioner/templates/storageclass.yaml @@ -0,0 +1,15 @@ +{{ if .Values.storageClass.create -}} +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + labels: + app: {{ template "nfs-client-provisioner.name" . }} + chart: {{ template "nfs-client-provisioner.chart" . }} + release: {{ .Release.Name }} + name: {{ .Values.storageClass.name }} +{{- if .Values.storageClass.defaultClass }} + annotations: + storageclass.kubernetes.io/is-default-class: "true" +{{- end }} +provisioner: {{ .Values.storageClass.provisionerName }} +{{ end -}} diff --git a/incubator/nfs-client-provisioner/values.yaml b/incubator/nfs-client-provisioner/values.yaml new file mode 100644 index 000000000000..cfb0ac41b031 --- /dev/null +++ b/incubator/nfs-client-provisioner/values.yaml @@ -0,0 +1,52 @@ +# Default values for nfs-client-provisioner. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 +strategyType: Recreate + +image: + repository: quay.io/external_storage/nfs-client-provisioner + tag: v2.1.1-k8s1.10 + pullPolicy: IfNotPresent + +nfs: + server: + path: /ifs/kubernetes + +## For creating the StorageClass automatically: +storageClass: + create: true + + ## Set a provisioner name. If unset, a name will be generated. + provisionerName: fuseim.pri/ifs + + ## Set StorageClass as the default StorageClass + ## Ignored if storageClass.create is false + defaultClass: false + + ## Set a StorageClass name + ## Ignored if storageClass.create is false + name: nfs-client + +## For RBAC support: +rbac: + create: true + + ## Ignored if rbac.create is true + ## + serviceAccountName: default + +resources: {} + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {} From 11c79842100700b980cbdd550a02f5c91ac6447f Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Tue, 3 Jul 2018 18:05:00 +0200 Subject: [PATCH 02/19] Moved to stable, minimum version is 1.9+ --- {incubator => stable}/nfs-client-provisioner/.helmignore | 0 {incubator => stable}/nfs-client-provisioner/Chart.yaml | 0 {incubator => stable}/nfs-client-provisioner/README.md | 2 +- .../nfs-client-provisioner/templates/_helpers.tpl | 0 .../nfs-client-provisioner/templates/clusterrole.yaml | 0 .../nfs-client-provisioner/templates/clusterrolebinding.yaml | 0 .../nfs-client-provisioner/templates/deployment.yaml | 0 .../nfs-client-provisioner/templates/serviceaccount.yaml | 0 .../nfs-client-provisioner/templates/storageclass.yaml | 0 {incubator => stable}/nfs-client-provisioner/values.yaml | 0 10 files changed, 1 insertion(+), 1 deletion(-) rename {incubator => stable}/nfs-client-provisioner/.helmignore (100%) rename {incubator => stable}/nfs-client-provisioner/Chart.yaml (100%) rename {incubator => stable}/nfs-client-provisioner/README.md (99%) rename {incubator => stable}/nfs-client-provisioner/templates/_helpers.tpl (100%) rename {incubator => stable}/nfs-client-provisioner/templates/clusterrole.yaml (100%) rename {incubator => stable}/nfs-client-provisioner/templates/clusterrolebinding.yaml (100%) rename {incubator => stable}/nfs-client-provisioner/templates/deployment.yaml (100%) rename {incubator => stable}/nfs-client-provisioner/templates/serviceaccount.yaml (100%) rename {incubator => stable}/nfs-client-provisioner/templates/storageclass.yaml (100%) rename {incubator => stable}/nfs-client-provisioner/values.yaml (100%) diff --git a/incubator/nfs-client-provisioner/.helmignore b/stable/nfs-client-provisioner/.helmignore similarity index 100% rename from incubator/nfs-client-provisioner/.helmignore rename to stable/nfs-client-provisioner/.helmignore diff --git a/incubator/nfs-client-provisioner/Chart.yaml b/stable/nfs-client-provisioner/Chart.yaml similarity index 100% rename from incubator/nfs-client-provisioner/Chart.yaml rename to stable/nfs-client-provisioner/Chart.yaml diff --git a/incubator/nfs-client-provisioner/README.md b/stable/nfs-client-provisioner/README.md similarity index 99% rename from incubator/nfs-client-provisioner/README.md rename to stable/nfs-client-provisioner/README.md index f09a9b651e85..d2f29fc91744 100644 --- a/incubator/nfs-client-provisioner/README.md +++ b/stable/nfs-client-provisioner/README.md @@ -14,7 +14,7 @@ This charts installs custom [storage class](https://kubernetes.io/docs/concepts/ ## Prerequisites -- Kubernetes 1.7+ +- Kubernetes 1.9+ - Existing NFS Share ## Installing the Chart diff --git a/incubator/nfs-client-provisioner/templates/_helpers.tpl b/stable/nfs-client-provisioner/templates/_helpers.tpl similarity index 100% rename from incubator/nfs-client-provisioner/templates/_helpers.tpl rename to stable/nfs-client-provisioner/templates/_helpers.tpl diff --git a/incubator/nfs-client-provisioner/templates/clusterrole.yaml b/stable/nfs-client-provisioner/templates/clusterrole.yaml similarity index 100% rename from incubator/nfs-client-provisioner/templates/clusterrole.yaml rename to stable/nfs-client-provisioner/templates/clusterrole.yaml diff --git a/incubator/nfs-client-provisioner/templates/clusterrolebinding.yaml b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml similarity index 100% rename from incubator/nfs-client-provisioner/templates/clusterrolebinding.yaml rename to stable/nfs-client-provisioner/templates/clusterrolebinding.yaml diff --git a/incubator/nfs-client-provisioner/templates/deployment.yaml b/stable/nfs-client-provisioner/templates/deployment.yaml similarity index 100% rename from incubator/nfs-client-provisioner/templates/deployment.yaml rename to stable/nfs-client-provisioner/templates/deployment.yaml diff --git a/incubator/nfs-client-provisioner/templates/serviceaccount.yaml b/stable/nfs-client-provisioner/templates/serviceaccount.yaml similarity index 100% rename from incubator/nfs-client-provisioner/templates/serviceaccount.yaml rename to stable/nfs-client-provisioner/templates/serviceaccount.yaml diff --git a/incubator/nfs-client-provisioner/templates/storageclass.yaml b/stable/nfs-client-provisioner/templates/storageclass.yaml similarity index 100% rename from incubator/nfs-client-provisioner/templates/storageclass.yaml rename to stable/nfs-client-provisioner/templates/storageclass.yaml diff --git a/incubator/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml similarity index 100% rename from incubator/nfs-client-provisioner/values.yaml rename to stable/nfs-client-provisioner/values.yaml From df53d673985bf9d8f844c4095099c01e3bdfa11e Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Tue, 3 Jul 2018 23:11:34 +0200 Subject: [PATCH 03/19] Change provisionerName default --- stable/nfs-client-provisioner/templates/_helpers.tpl | 8 ++++++++ stable/nfs-client-provisioner/values.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/templates/_helpers.tpl b/stable/nfs-client-provisioner/templates/_helpers.tpl index 9bcc3a23f8b4..63ddc4fc92d4 100644 --- a/stable/nfs-client-provisioner/templates/_helpers.tpl +++ b/stable/nfs-client-provisioner/templates/_helpers.tpl @@ -30,3 +30,11 @@ Create chart name and version as used by the chart label. {{- define "nfs-client-provisioner.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "nfs-client-provisioner.provisionerName" -}} +{{- if .Values.storageClass.provisionerName -}} +{{- printf .Values.storageClass.provisionerName -}} +{{- else -}} +cluster.local/{{ template "nfs-client-provisioner.fullname" . -}} +{{- end -}} +{{- end -}} diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index cfb0ac41b031..6002f68dc611 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -19,7 +19,7 @@ storageClass: create: true ## Set a provisioner name. If unset, a name will be generated. - provisionerName: fuseim.pri/ifs + # provisionerName: ## Set StorageClass as the default StorageClass ## Ignored if storageClass.create is false From 650853f2f21d5611eee087e4fa3dc10104b92f7f Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Sun, 15 Jul 2018 23:08:23 +0200 Subject: [PATCH 04/19] Change incubator references to stable in README, Add heritage labels, apply RBAC best practices, apps/v1 --- stable/nfs-client-provisioner/README.md | 4 ++-- stable/nfs-client-provisioner/templates/_helpers.tpl | 11 +++++++++++ .../nfs-client-provisioner/templates/clusterrole.yaml | 1 + .../templates/clusterrolebinding.yaml | 1 + .../nfs-client-provisioner/templates/deployment.yaml | 3 ++- .../templates/serviceaccount.yaml | 5 +++-- .../templates/storageclass.yaml | 1 + 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/stable/nfs-client-provisioner/README.md b/stable/nfs-client-provisioner/README.md index d2f29fc91744..206188d329ea 100644 --- a/stable/nfs-client-provisioner/README.md +++ b/stable/nfs-client-provisioner/README.md @@ -5,7 +5,7 @@ The [NFS client provisioner](https://github.com/kubernetes-incubator/external-st ## TL;DR; ```console -$ helm install incubator/nfs-client-provisioner +$ helm install stable/nfs-client-provisioner ``` ## Introduction @@ -22,7 +22,7 @@ This charts installs custom [storage class](https://kubernetes.io/docs/concepts/ To install the chart with the release name `my-release`: ```console -$ helm install --name my-release --set nfs.server=x.x.x.x --set nfs.path=/exported/path incubator/nfs-client-provisioner +$ helm install --name my-release --set nfs.server=x.x.x.x --set nfs.path=/exported/path stable/nfs-client-provisioner ``` The command deploys the given storage class in the default configuration. It can be used afterswards to provision persistent volumes. The [configuration](#configuration) section lists the parameters that can be configured during installation. diff --git a/stable/nfs-client-provisioner/templates/_helpers.tpl b/stable/nfs-client-provisioner/templates/_helpers.tpl index 63ddc4fc92d4..824e26c23fae 100644 --- a/stable/nfs-client-provisioner/templates/_helpers.tpl +++ b/stable/nfs-client-provisioner/templates/_helpers.tpl @@ -38,3 +38,14 @@ Create chart name and version as used by the chart label. cluster.local/{{ template "nfs-client-provisioner.fullname" . -}} {{- end -}} {{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "nfs-client-provisioner.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "nfs-client-provisioner.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} diff --git a/stable/nfs-client-provisioner/templates/clusterrole.yaml b/stable/nfs-client-provisioner/templates/clusterrole.yaml index 1992fc706113..277e0be3fab1 100644 --- a/stable/nfs-client-provisioner/templates/clusterrole.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrole.yaml @@ -4,6 +4,7 @@ metadata: labels: app: {{ template "nfs-client-provisioner.name" . }} chart: {{ template "nfs-client-provisioner.chart" . }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} name: {{ template "nfs-client-provisioner.name" . }}-runner rules: diff --git a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml index 020f72ebb4f9..5d91b6e7fd68 100644 --- a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml @@ -4,6 +4,7 @@ metadata: labels: app: {{ template "nfs-client-provisioner.name" . }} chart: {{ template "nfs-client-provisioner.chart" . }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} name: run-{{ template "nfs-client-provisioner.name" . }} subjects: diff --git a/stable/nfs-client-provisioner/templates/deployment.yaml b/stable/nfs-client-provisioner/templates/deployment.yaml index 58714244a955..60716bba7d43 100644 --- a/stable/nfs-client-provisioner/templates/deployment.yaml +++ b/stable/nfs-client-provisioner/templates/deployment.yaml @@ -1,10 +1,11 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "nfs-client-provisioner.fullname" . }} labels: app: {{ template "nfs-client-provisioner.name" . }} chart: {{ template "nfs-client-provisioner.chart" . }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} spec: replicas: {{ .Values.replicaCount }} diff --git a/stable/nfs-client-provisioner/templates/serviceaccount.yaml b/stable/nfs-client-provisioner/templates/serviceaccount.yaml index 3f8b8e696f21..294089676d0e 100644 --- a/stable/nfs-client-provisioner/templates/serviceaccount.yaml +++ b/stable/nfs-client-provisioner/templates/serviceaccount.yaml @@ -1,10 +1,11 @@ -{{- if .Values.rbac.create }} +{{ if .Values.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount metadata: labels: app: {{ template "nfs-client-provisioner.name" . }} chart: {{ template "nfs-client-provisioner.chart" . }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "nfs-client-provisioner.name" . }} + name: {{ template "nfs-client-provisioner.serviceAccountName" . }} {{- end -}} diff --git a/stable/nfs-client-provisioner/templates/storageclass.yaml b/stable/nfs-client-provisioner/templates/storageclass.yaml index 85ae9bf00f34..e479183f27a8 100644 --- a/stable/nfs-client-provisioner/templates/storageclass.yaml +++ b/stable/nfs-client-provisioner/templates/storageclass.yaml @@ -5,6 +5,7 @@ metadata: labels: app: {{ template "nfs-client-provisioner.name" . }} chart: {{ template "nfs-client-provisioner.chart" . }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} name: {{ .Values.storageClass.name }} {{- if .Values.storageClass.defaultClass }} From 48d0aed4f1ffdde4cd618159c57c0f4fe1610f9b Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Sun, 15 Jul 2018 23:16:07 +0200 Subject: [PATCH 05/19] update values.yaml to serviceAccount changes --- stable/nfs-client-provisioner/values.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index 6002f68dc611..94e7342b6eeb 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -31,11 +31,16 @@ storageClass: ## For RBAC support: rbac: + # Specifies whether RBAC resources should be created create: true - ## Ignored if rbac.create is true - ## - serviceAccountName: default +serviceAccount: + # Specifies whether a ServiceAccount should be created + create: true + + # The name of the ServiceAccount to use. + # If not set and create is true, a name is generated using the fullname template + name: resources: {} # limits: From 5ac4942d38a0e2201da9ad06144071242781ee24 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Sun, 15 Jul 2018 23:22:15 +0200 Subject: [PATCH 06/19] use helpers for storageclass provisionerName --- stable/nfs-client-provisioner/templates/storageclass.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/templates/storageclass.yaml b/stable/nfs-client-provisioner/templates/storageclass.yaml index e479183f27a8..c12f4bc70b29 100644 --- a/stable/nfs-client-provisioner/templates/storageclass.yaml +++ b/stable/nfs-client-provisioner/templates/storageclass.yaml @@ -12,5 +12,5 @@ metadata: annotations: storageclass.kubernetes.io/is-default-class: "true" {{- end }} -provisioner: {{ .Values.storageClass.provisionerName }} +provisioner: {{ nfs-client-provisioner.provisionerName }} {{ end -}} From 862463caa8af22e974fc14d78269d8127a7b067f Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Sun, 15 Jul 2018 23:23:48 +0200 Subject: [PATCH 07/19] actually use template for helper variable --- stable/nfs-client-provisioner/templates/storageclass.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/templates/storageclass.yaml b/stable/nfs-client-provisioner/templates/storageclass.yaml index c12f4bc70b29..c25c22c120d8 100644 --- a/stable/nfs-client-provisioner/templates/storageclass.yaml +++ b/stable/nfs-client-provisioner/templates/storageclass.yaml @@ -12,5 +12,5 @@ metadata: annotations: storageclass.kubernetes.io/is-default-class: "true" {{- end }} -provisioner: {{ nfs-client-provisioner.provisionerName }} +provisioner: {{ template "nfs-client-provisioner.provisionerName" . }} {{ end -}} From 0f40d9df2349860285a62e3aae7f3600c07a3ba1 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Mon, 16 Jul 2018 11:38:24 +0200 Subject: [PATCH 08/19] Make allowVolumeExpansion and reclaimPolicy configurable --- .../templates/storageclass.yaml | 2 ++ stable/nfs-client-provisioner/values.yaml | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/stable/nfs-client-provisioner/templates/storageclass.yaml b/stable/nfs-client-provisioner/templates/storageclass.yaml index c25c22c120d8..2b12f9668ca2 100644 --- a/stable/nfs-client-provisioner/templates/storageclass.yaml +++ b/stable/nfs-client-provisioner/templates/storageclass.yaml @@ -13,4 +13,6 @@ metadata: storageclass.kubernetes.io/is-default-class: "true" {{- end }} provisioner: {{ template "nfs-client-provisioner.provisionerName" . }} +allowVolumeExpansion: {{ .Values.storageClass.allowVolumeExpansion }} +reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }} {{ end -}} diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index 94e7342b6eeb..be734f9f527b 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -14,21 +14,27 @@ nfs: server: path: /ifs/kubernetes -## For creating the StorageClass automatically: +# For creating the StorageClass automatically: storageClass: create: true - ## Set a provisioner name. If unset, a name will be generated. + # Set a provisioner name. If unset, a name will be generated. # provisionerName: - ## Set StorageClass as the default StorageClass - ## Ignored if storageClass.create is false + # Set StorageClass as the default StorageClass + # Ignored if storageClass.create is false defaultClass: false - ## Set a StorageClass name - ## Ignored if storageClass.create is false + # Set a StorageClass name + # Ignored if storageClass.create is false name: nfs-client + # Allow volume to be expanded dynamically + allowVolumeExpansion: true + + # Method used to reclaim an obsoleted volume + reclaimPolicy: Delete + ## For RBAC support: rbac: # Specifies whether RBAC resources should be created From d67533e7149d63bc5a504260544a29b917d35ebe Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 8 Aug 2018 13:06:34 +0200 Subject: [PATCH 09/19] fullname everywhere, update readme and set to latest version --- stable/nfs-client-provisioner/README.md | 6 +++--- stable/nfs-client-provisioner/templates/clusterrole.yaml | 2 +- .../templates/clusterrolebinding.yaml | 6 +++--- stable/nfs-client-provisioner/values.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stable/nfs-client-provisioner/README.md b/stable/nfs-client-provisioner/README.md index 206188d329ea..0fc74653bd85 100644 --- a/stable/nfs-client-provisioner/README.md +++ b/stable/nfs-client-provisioner/README.md @@ -48,10 +48,10 @@ The following tables lists the configurable parameters of this chart and their d | `replicaCount` | number of provisioner instances to deployed | 1 | | `strategyType` | specifies the strategy used to replace old Pods by new ones | Recreate | | `image.repository` | provisioner image | `quay.io/external_storage/nfs-client-provisioner` | -| `image.tag` | version of provisioner image | `v2.1.1-k8s1.10` | +| `image.tag` | version of provisioner image | `v2.1.2-k8s1.11` | | `image.pullPolicy` | image pull policy | `IfNotPresent` | -| `storageclass.nane` | name of the storageclass | `nfs-client` | -| `nfs.provisionerName` | name of the provisionerName | `fuseim.pri/ifs` | +| `storageclass.name` | name of the storageclass | `nfs-client` | +| `storageclass.provisionerName` | name of the provisionerName | null | | `nfs.server` | hostname of the NFS server | null (ip or hostname) | | `nfs.path` | basepath of the mount point to be used | `/ifs/kubernetes` | | `resources` | Resources required (e.g. CPU, memory) | `{}` | diff --git a/stable/nfs-client-provisioner/templates/clusterrole.yaml b/stable/nfs-client-provisioner/templates/clusterrole.yaml index 277e0be3fab1..812eca63ebb7 100644 --- a/stable/nfs-client-provisioner/templates/clusterrole.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrole.yaml @@ -6,7 +6,7 @@ metadata: chart: {{ template "nfs-client-provisioner.chart" . }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "nfs-client-provisioner.name" . }}-runner + name: {{ template "nfs-client-provisioner.fullname" . }}-runner rules: - apiGroups: [""] resources: ["persistentvolumes"] diff --git a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml index 5d91b6e7fd68..9be414b2fd48 100644 --- a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml @@ -6,12 +6,12 @@ metadata: chart: {{ template "nfs-client-provisioner.chart" . }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: run-{{ template "nfs-client-provisioner.name" . }} + name: run-{{ template "nfs-client-provisioner.fullname" . }} subjects: - kind: ServiceAccount - name: {{ template "nfs-client-provisioner.name" . }} + name: {{ template "nfs-client-provisioner.fullname" . }} namespace: {{ .Release.Namespace }} roleRef: kind: ClusterRole - name: {{ template "nfs-client-provisioner.name" . }}-runner + name: {{ template "nfs-client-provisioner.fullname" . }}-runner apiGroup: rbac.authorization.k8s.io diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index be734f9f527b..d04d7f1ec4ee 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -7,7 +7,7 @@ strategyType: Recreate image: repository: quay.io/external_storage/nfs-client-provisioner - tag: v2.1.1-k8s1.10 + tag: v2.1.2-k8s1.11 pullPolicy: IfNotPresent nfs: From 08f470e85af1758f11b729f3f6182b84ec61fd3e Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 8 Aug 2018 15:06:41 +0200 Subject: [PATCH 10/19] use helper for serviceAccountName --- stable/nfs-client-provisioner/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/templates/deployment.yaml b/stable/nfs-client-provisioner/templates/deployment.yaml index 60716bba7d43..0233414812fd 100644 --- a/stable/nfs-client-provisioner/templates/deployment.yaml +++ b/stable/nfs-client-provisioner/templates/deployment.yaml @@ -21,7 +21,7 @@ spec: app: {{ template "nfs-client-provisioner.name" . }} release: {{ .Release.Name }} spec: - serviceAccountName: {{ if .Values.rbac.create }}{{ template "nfs-client-provisioner.fullname" . }}{{ else }}{{ .Values.rbac.serviceAccountName | quote }}{{ end }} + serviceAccountName: {{ template "nfs-client-provisioner.serviceAccountName" }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" From 732942157d982caea920ef9ac13c373c26476f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Wed, 8 Aug 2018 16:17:22 +0200 Subject: [PATCH 11/19] Update deployment.yaml --- stable/nfs-client-provisioner/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/templates/deployment.yaml b/stable/nfs-client-provisioner/templates/deployment.yaml index 0233414812fd..d597541ec99e 100644 --- a/stable/nfs-client-provisioner/templates/deployment.yaml +++ b/stable/nfs-client-provisioner/templates/deployment.yaml @@ -21,7 +21,7 @@ spec: app: {{ template "nfs-client-provisioner.name" . }} release: {{ .Release.Name }} spec: - serviceAccountName: {{ template "nfs-client-provisioner.serviceAccountName" }} + serviceAccountName: {{ template "nfs-client-provisioner.serviceAccountName" . }} containers: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" From 1ce1eb47b476d35e2d7f78624cb0cbdc7c5a666e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Wed, 8 Aug 2018 16:20:17 +0200 Subject: [PATCH 12/19] Update values.yaml --- stable/nfs-client-provisioner/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index d04d7f1ec4ee..b19d280250cf 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -11,7 +11,7 @@ image: pullPolicy: IfNotPresent nfs: - server: + server: path: /ifs/kubernetes # For creating the StorageClass automatically: @@ -19,7 +19,7 @@ storageClass: create: true # Set a provisioner name. If unset, a name will be generated. - # provisionerName: + # provisionerName: # Set StorageClass as the default StorageClass # Ignored if storageClass.create is false From adac718464c0deb6e0a966fd338af0c60ffcb433 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 8 Aug 2018 19:51:21 +0200 Subject: [PATCH 13/19] remove whitespace --- stable/nfs-client-provisioner/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index d04d7f1ec4ee..b19d280250cf 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -11,7 +11,7 @@ image: pullPolicy: IfNotPresent nfs: - server: + server: path: /ifs/kubernetes # For creating the StorageClass automatically: @@ -19,7 +19,7 @@ storageClass: create: true # Set a provisioner name. If unset, a name will be generated. - # provisionerName: + # provisionerName: # Set StorageClass as the default StorageClass # Ignored if storageClass.create is false From 9ca4f930e9b5761370b98c347965e0b3de9f12a3 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 8 Aug 2018 23:25:49 +0200 Subject: [PATCH 14/19] use helper function for sa binding as well --- stable/nfs-client-provisioner/templates/clusterrolebinding.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml index 9be414b2fd48..a3dd1b9f7e67 100644 --- a/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrolebinding.yaml @@ -9,7 +9,7 @@ metadata: name: run-{{ template "nfs-client-provisioner.fullname" . }} subjects: - kind: ServiceAccount - name: {{ template "nfs-client-provisioner.fullname" . }} + name: {{ template "nfs-client-provisioner.serviceAccountName" . }} namespace: {{ .Release.Namespace }} roleRef: kind: ClusterRole From ed61c6e41a83d86ec7b64fc369e45916457a7e46 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Mon, 13 Aug 2018 22:39:57 +0200 Subject: [PATCH 15/19] add default nfs.server value for ci --- stable/nfs-client-provisioner/ci/test-values.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 stable/nfs-client-provisioner/ci/test-values.yaml diff --git a/stable/nfs-client-provisioner/ci/test-values.yaml b/stable/nfs-client-provisioner/ci/test-values.yaml new file mode 100644 index 000000000000..2ef0a715794c --- /dev/null +++ b/stable/nfs-client-provisioner/ci/test-values.yaml @@ -0,0 +1,2 @@ +nfs: + server: 127.0.0.1 From 7d7b4b18240dd78ec3da4f4506c8612c91dc6182 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 15 Aug 2018 20:18:57 +0200 Subject: [PATCH 16/19] add endpoints bindings --- stable/nfs-client-provisioner/templates/clusterrole.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stable/nfs-client-provisioner/templates/clusterrole.yaml b/stable/nfs-client-provisioner/templates/clusterrole.yaml index 812eca63ebb7..460ba07055f6 100644 --- a/stable/nfs-client-provisioner/templates/clusterrole.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrole.yaml @@ -20,3 +20,6 @@ rules: - apiGroups: [""] resources: ["events"] verbs: ["list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["endpoints"] + verbs: ["get", "list", "watch", "create", "update", "patch"] From 09598e625f0356f12143bb162b3bf4bbb236ced4 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 15 Aug 2018 20:21:17 +0200 Subject: [PATCH 17/19] go to version 3.0.1 --- stable/nfs-client-provisioner/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index b19d280250cf..12c5f19e9f96 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -7,7 +7,7 @@ strategyType: Recreate image: repository: quay.io/external_storage/nfs-client-provisioner - tag: v2.1.2-k8s1.11 + tag: v3.0.1-k8s1.11 pullPolicy: IfNotPresent nfs: From eb65cb42d1213f7c0c10e199a1a0fac977321cc7 Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 15 Aug 2018 21:36:53 +0200 Subject: [PATCH 18/19] add archiveOnDelete, sync clusterrole rules --- stable/nfs-client-provisioner/templates/clusterrole.yaml | 2 +- stable/nfs-client-provisioner/templates/deployment.yaml | 2 +- stable/nfs-client-provisioner/templates/storageclass.yaml | 2 ++ stable/nfs-client-provisioner/values.yaml | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stable/nfs-client-provisioner/templates/clusterrole.yaml b/stable/nfs-client-provisioner/templates/clusterrole.yaml index 460ba07055f6..ba09b3e5a689 100644 --- a/stable/nfs-client-provisioner/templates/clusterrole.yaml +++ b/stable/nfs-client-provisioner/templates/clusterrole.yaml @@ -19,7 +19,7 @@ rules: verbs: ["get", "list", "watch"] - apiGroups: [""] resources: ["events"] - verbs: ["list", "watch", "create", "update", "patch"] + verbs: ["create", "update", "patch"] - apiGroups: [""] resources: ["endpoints"] verbs: ["get", "list", "watch", "create", "update", "patch"] diff --git a/stable/nfs-client-provisioner/templates/deployment.yaml b/stable/nfs-client-provisioner/templates/deployment.yaml index d597541ec99e..5ca757543cec 100644 --- a/stable/nfs-client-provisioner/templates/deployment.yaml +++ b/stable/nfs-client-provisioner/templates/deployment.yaml @@ -31,7 +31,7 @@ spec: mountPath: /persistentvolumes env: - name: PROVISIONER_NAME - value: {{ .Values.storageClass.provisionerName }} + value: {{ template "nfs-client-provisioner.provisionerName" . }} - name: NFS_SERVER value: {{ .Values.nfs.server }} - name: NFS_PATH diff --git a/stable/nfs-client-provisioner/templates/storageclass.yaml b/stable/nfs-client-provisioner/templates/storageclass.yaml index 2b12f9668ca2..686ffe98f7d3 100644 --- a/stable/nfs-client-provisioner/templates/storageclass.yaml +++ b/stable/nfs-client-provisioner/templates/storageclass.yaml @@ -15,4 +15,6 @@ metadata: provisioner: {{ template "nfs-client-provisioner.provisionerName" . }} allowVolumeExpansion: {{ .Values.storageClass.allowVolumeExpansion }} reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }} +parameters: + archiveOnDelete: "{{ .Values.storageClass.archiveOnDelete }}" {{ end -}} diff --git a/stable/nfs-client-provisioner/values.yaml b/stable/nfs-client-provisioner/values.yaml index 12c5f19e9f96..9eb72b3fe5b8 100644 --- a/stable/nfs-client-provisioner/values.yaml +++ b/stable/nfs-client-provisioner/values.yaml @@ -35,6 +35,9 @@ storageClass: # Method used to reclaim an obsoleted volume reclaimPolicy: Delete + # When set to false your PVs will not be archived by the provisioner upon deletion of the PVC. + archiveOnDelete: true + ## For RBAC support: rbac: # Specifies whether RBAC resources should be created From 63f859b20da9a524d0f0c41c6af6b871e31d633f Mon Sep 17 00:00:00 2001 From: Bart Verwilst Date: Wed, 15 Aug 2018 21:43:03 +0200 Subject: [PATCH 19/19] fix README.md parameters --- stable/nfs-client-provisioner/README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stable/nfs-client-provisioner/README.md b/stable/nfs-client-provisioner/README.md index 0fc74653bd85..d9bb3652558b 100644 --- a/stable/nfs-client-provisioner/README.md +++ b/stable/nfs-client-provisioner/README.md @@ -45,13 +45,17 @@ The following tables lists the configurable parameters of this chart and their d | Parameter | Description | Default | | --------------------------------- | ------------------------------------- | --------------------------------------------------------- | -| `replicaCount` | number of provisioner instances to deployed | 1 | -| `strategyType` | specifies the strategy used to replace old Pods by new ones | Recreate | +| `replicaCount` | number of provisioner instances to deployed | `1` | +| `strategyType` | specifies the strategy used to replace old Pods by new ones | `Recreate` | | `image.repository` | provisioner image | `quay.io/external_storage/nfs-client-provisioner` | -| `image.tag` | version of provisioner image | `v2.1.2-k8s1.11` | +| `image.tag` | version of provisioner image | `v3.0.1-k8s1.11` | | `image.pullPolicy` | image pull policy | `IfNotPresent` | | `storageclass.name` | name of the storageclass | `nfs-client` | +| `storageclass.defaultClass` | Set as the default StorageClass | `false` | +| `storageclass.allowVolumeExpansion` | Allow expanding the volume | `true` | +| `storageclass.reclaimPolicy` | Method used to reclaim an obsoleted volume | `Delete` | | `storageclass.provisionerName` | name of the provisionerName | null | +| `storageclass.archiveOnDelete` | archive pvc when deleting | `true` | | `nfs.server` | hostname of the NFS server | null (ip or hostname) | | `nfs.path` | basepath of the mount point to be used | `/ifs/kubernetes` | | `resources` | Resources required (e.g. CPU, memory) | `{}` |