diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index e7d84b948..d9eeb85c2 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -71,6 +71,8 @@ helm delete --namespace rook-ceph rook-ceph The command removes all the Kubernetes components associated with the chart and deletes the release. +After uninstalling you may want to clean up the CRDs as described on the [teardown documentation](ceph-teardown.md#removing-the-cluster-crd-finalizer). + ## Configuration The following tables lists the configurable parameters of the rook-operator chart and their default values. @@ -80,7 +82,7 @@ The following tables lists the configurable parameters of the rook-operator char | `image.repository` | Image | `rook/ceph` | | `image.tag` | Image tag | `master` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `crds.enabled` | If true, the helm chart will create the Rook CRDs. **WARNING** Do NOT change during upgrades or the cluster will be destroyed. | `true` | +| `crds.enabled` | If true, the helm chart will create the Rook CRDs. | `true` | | `rbacEnable` | If true, create & use RBAC resources | `true` | | `pspEnable` | If true, create & use PSP resources | `true` | | `resources` | Pod resource requests & limits | `{}` | diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index adae27896..f4482321b 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -5,6 +5,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephclusters.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -407,6 +409,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephclients.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -439,6 +443,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephrbdmirrors.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -493,6 +499,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephfilesystems.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -664,6 +672,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephnfses.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -723,6 +733,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephobjectstores.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -898,6 +910,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephobjectstoreusers.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -934,6 +948,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephobjectrealms.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -968,6 +984,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephobjectzonegroups.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -999,6 +1017,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephobjectzones.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1103,6 +1123,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephblockpools.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1211,6 +1233,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: volumes.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: rook.io names: @@ -1256,6 +1280,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: objectbuckets.objectbucket.io + annotations: + helm.sh/resource-policy: keep spec: group: objectbucket.io names: @@ -1325,6 +1351,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: objectbucketclaims.objectbucket.io + annotations: + helm.sh/resource-policy: keep spec: group: objectbucket.io names: @@ -1369,6 +1397,8 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: name: cephfilesystemmirrors.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1414,6 +1444,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephclusters.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1628,6 +1660,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephfilesystems.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1752,6 +1786,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephnfses.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1788,6 +1824,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephobjectstores.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1901,6 +1939,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephobjectstoreusers.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1920,6 +1960,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephobjectrealms.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1937,6 +1979,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephobjectzonegroups.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1954,6 +1998,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephobjectzones.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -1971,6 +2017,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephblockpools.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -2052,6 +2100,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: volumes.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: rook.io names: @@ -2070,6 +2120,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: objectbuckets.objectbucket.io + annotations: + helm.sh/resource-policy: keep spec: group: objectbucket.io versions: @@ -2092,6 +2144,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: objectbucketclaims.objectbucket.io + annotations: + helm.sh/resource-policy: keep spec: versions: - name: v1alpha1 @@ -2114,6 +2168,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephclients.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: @@ -2137,6 +2193,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: cephrbdmirrors.ceph.rook.io + annotations: + helm.sh/resource-policy: keep spec: group: ceph.rook.io names: