diff --git a/.commitlintrc.json b/.commitlintrc.json index 3c636dd4d..cbf5da291 100644 --- a/.commitlintrc.json +++ b/.commitlintrc.json @@ -39,8 +39,7 @@ "subvolumegroup", "namespace", "test", - "tests", - "webhook" + "tests" ] ], "body-leading-blank": [ diff --git a/Documentation/CRDs/specification.md b/Documentation/CRDs/specification.md index 761044d13..f55b3c4b2 100644 --- a/Documentation/CRDs/specification.md +++ b/Documentation/CRDs/specification.md @@ -11461,11 +11461,6 @@ int64 -
A StatusConditionGetter allows getting a pointer to an object’s conditions.
-
diff --git a/Documentation/Getting-Started/Prerequisites/prerequisites.md b/Documentation/Getting-Started/Prerequisites/prerequisites.md
index d05e31a2e..aaa7e0f0c 100644
--- a/Documentation/Getting-Started/Prerequisites/prerequisites.md
+++ b/Documentation/Getting-Started/Prerequisites/prerequisites.md
@@ -36,16 +36,6 @@ vdb
If the `FSTYPE` field is not empty, there is a filesystem on top of the corresponding device. In this example, `vdb` is available to Rook, while `vda` and its partitions have a filesystem and are not available.
-## Admission Controller
-
-Enabling the Rook admission controller is recommended to provide an additional level of validation that Rook is configured correctly with the custom resource (CR) settings. An admission controller intercepts requests to the Kubernetes API server prior to persistence of the object, but after the request is authenticated and authorized.
-
-To deploy the Rook admission controllers, install the cert manager before Rook is installed:
-
-```console
-kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.11.1/cert-manager.yaml
-```
-
## LVM package
Ceph OSDs have a dependency on LVM in the following scenarios:
diff --git a/Documentation/Helm-Charts/operator-chart.md b/Documentation/Helm-Charts/operator-chart.md
index 69b14d691..658851c92 100644
--- a/Documentation/Helm-Charts/operator-chart.md
+++ b/Documentation/Helm-Charts/operator-chart.md
@@ -47,7 +47,6 @@ The following table lists the configurable parameters of the rook-operator chart
| Parameter | Description | Default |
|-----------|-------------|---------|
-| `admissionController` | Set tolerations and nodeAffinity [^1] for admission controller pod. The admission controller would be best to start on the same nodes as other ceph daemons. | `nil` |
| `allowLoopDevices` | If true, loop devices are allowed to be used for osds in test clusters | `false` |
| `annotations` | Pod annotations | `{}` |
| `cephCommandsTimeoutSeconds` | The timeout for ceph commands in seconds | `"15"` |
@@ -125,7 +124,6 @@ The following table lists the configurable parameters of the rook-operator chart
| `csi.topology.domainLabels` | domainLabels define which node labels to use as domains for CSI nodeplugins to advertise their domains | `nil` |
| `csi.topology.enabled` | Enable topology based provisioning | `false` |
| `currentNamespaceOnly` | Whether the operator should watch cluster CRD in its own namespace or not | `false` |
-| `disableAdmissionController` | Whether to disable the admission controller | `true` |
| `disableDeviceHotplug` | Disable automatic orchestration when new devices are discovered. | `false` |
| `discover.nodeAffinity` | The node labels for affinity of `discover-agent` [^1] | `nil` |
| `discover.podLabels` | Labels to add to the discover pods | `nil` |
diff --git a/Documentation/Troubleshooting/disaster-recovery.md b/Documentation/Troubleshooting/disaster-recovery.md
index 8f7728c11..c512dd0a2 100644
--- a/Documentation/Troubleshooting/disaster-recovery.md
+++ b/Documentation/Troubleshooting/disaster-recovery.md
@@ -40,13 +40,13 @@ the CRs to their prior state without even necessarily suffering cluster downtime
In the following commands, the affected `CephCluster` resource is called `rook-ceph`. If yours is named differently, the
commands will need to be adjusted.
-1. Scale down the operator.
+1. Scale down the operator.
```console
kubectl -n rook-ceph scale --replicas=0 deploy/rook-ceph-operator
```
-2. Backup all Rook CRs and critical metadata
+2. Backup all Rook CRs and critical metadata
```console
# Store the `CephCluster` CR settings. Also, save other Rook CRs that are in terminating state.
@@ -57,18 +57,10 @@ the CRs to their prior state without even necessarily suffering cluster downtime
kubectl -n rook-ceph get configmap -o yaml > configmaps.yaml
```
-3. (Optional, if webhook is enabled)
- Delete the `ValidatingWebhookConfiguration`. This is the resource which connects Rook custom resources
- to the operator pod's validating webhook. Because the operator is unavailable, we must temporarily disable
- the valdiating webhook in order to make changes.
+3. Remove the owner references from all critical Rook resources that were referencing the `CephCluster` CR.
- ```console
- kubectl -n rook-ceph delete ValidatingWebhookConfiguration rook-ceph-webhook
- ```
+ 1. Programmatically determine all such resources, using this command:
-4. Remove the owner references from all critical Rook resources that were referencing the `CephCluster` CR.
-
- 1. Programmatically determine all such resources, using this command:
```console
# Determine the `CephCluster` UID
ROOK_UID=$(kubectl -n rook-ceph get cephcluster rook-ceph -o 'jsonpath={.metadata.uid}')
@@ -78,7 +70,7 @@ the CRs to their prior state without even necessarily suffering cluster downtime
kubectl -n rook-ceph get $RESOURCES
```
- 2. **Verify that all critical resources are shown in the output.** The critical resources are these:
+ 2. **Verify that all critical resources are shown in the output.** The critical resources are these:
- Secrets: `rook-ceph-admin-keyring`, `rook-ceph-config`, `rook-ceph-mon`, `rook-ceph-mons-keyring`
- ConfigMap: `rook-ceph-mon-endpoints`
@@ -86,10 +78,11 @@ the CRs to their prior state without even necessarily suffering cluster downtime
- Deployments: `rook-ceph-mon-*`, `rook-ceph-osd-*`, `rook-ceph-mgr-*`
- PVCs (if applicable): `rook-ceph-mon-*` and the OSD PVCs (named `