From 29f7d37199bbc25b6ad362eaa1b0bb7736ebbee1 Mon Sep 17 00:00:00 2001 From: Karol Chrapek Date: Sun, 15 Apr 2018 21:18:27 +0200 Subject: [PATCH] Update rook helm charts documentation Signed-off-by: Karol Chrapek --- Documentation/helm-operator.md | 3 ++- cluster/charts/rook/values.yaml.tmpl | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index e2a90538b..b24cf8587 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -94,12 +94,13 @@ The following tables lists the configurable parameters of the rook-operator char | `rbacEnable` | If true, create & use RBAC resources | `true` | | `resources` | Pod resource requests & limits | `{}` | | `logLevel` | Global log level | `INFO` | -| `agent.flexVolumeDirPath` | Path where the Rook agent discovers the flex volume plugins | `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/` | +| `agent.flexVolumeDirPath` | Path where the Rook agent discovers the flex volume plugins (*) | `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/` | | `agent.toleration` | Toleration for the agent pods | | | `agent.tolerationKey` | The specific key of the taint to tolerate | | | `mon.healthCheckInterval` | The frequency for the operator to check the mon health | `45s` | | `mon.monOutTimeout` | The time to wait before failing over an unhealthy mon | `300s` | +* For Kubernetes 1.9.x `agent.flexVolumeDirPath` should be changed to `/var/lib/kubelet/volumeplugins/`. [Flexvolume documentation](flexvolume.md#for-kubernetes--19x) ### Command Line You can pass the settings with helm command line parameters. Specify each parameter using the diff --git a/cluster/charts/rook/values.yaml.tmpl b/cluster/charts/rook/values.yaml.tmpl index 6a2d3f6c1..250268c37 100644 --- a/cluster/charts/rook/values.yaml.tmpl +++ b/cluster/charts/rook/values.yaml.tmpl @@ -39,4 +39,5 @@ rbacEnable: true # agent: # toleration: NoSchedule # tolerationKey: key +## For Kubernetes >= 1.9.x flexVolumeDirPath should be changed to /var/lib/kubelet/volumeplugins/ # flexVolumeDirPath: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/