From 8383d9ab87bc62708995722e83e3d55ce51d4067 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Fri, 4 Mar 2022 10:30:50 -0700 Subject: [PATCH] helm: remove obsolete setting for enabling multiple filesystems The multiple filesystem support was added in Pacific and no need for a setting that allows the support. The setting was already removed other places from rook in a previous change https://github.com/rook/rook/pull/8350. Signed-off-by: Travis Nielsen --- Documentation/helm-operator.md | 1 - deploy/charts/rook-ceph/values.yaml | 5 ----- 2 files changed, 6 deletions(-) diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index 51a14f0d263f..fcc7747541d2 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -150,7 +150,6 @@ The following tables lists the configurable parameters of the rook-operator char | `csi.csiAddons.image` | CSIAddons Sidecar image. | `quay.io/csiaddons/k8s-sidecar:v0.2.1` | | `admissionController.tolerations` | Array of tolerations in YAML format which will be added to admission controller deployment. | | | `admissionController.nodeAffinity` | The node labels for affinity of the admission controller deployment (***) | | -| `allowMultipleFilesystems` | **(experimental in Octopus (v15))** Allows multiple filesystems to be deployed to a Ceph cluster. | `false` | | `monitoring.enabled` | Create necessary RBAC rules for Rook to integrate with Prometheus monitoring in the operator namespace. Requires Prometheus to be pre-installed. | `false` | * * * `nodeAffinity` and `*NodeAffinity` options should have the format `"role=storage,rook; storage=ceph"` or `storage=;role=rook-example` or `storage=;` (_checks only for presence of key_) diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index 90d1eedbb022..4b6bc3ce6af8 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -307,11 +307,6 @@ csi: enableDiscoveryDaemon: false cephCommandsTimeoutSeconds: "15" -# enable the ability to have multiple Ceph filesystems in the same cluster -# WARNING: Experimental feature in Ceph Releases Octopus (v15) -# https://docs.ceph.com/en/octopus/cephfs/experimental-features/#multiple-file-systems-within-a-ceph-cluster -allowMultipleFilesystems: false - ## if true, run rook operator on the host network # useOperatorHostNetwork: true