From 0e42222c50f03f5407ea76633b6d0cf93675d942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 9 Apr 2020 11:30:33 +0200 Subject: [PATCH] ceph: helm add missing subresources to CRD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The subresources field was missing, this was missed in https://github.com/rook/rook/pull/4964. The .metadata.generation field is updated if and only if the value at the .spec subpath changes. Additionally, if the spec does not change, .metadata.generation is not updated. This is a must-have for the controller-runtime work, if we don't have this, the generation field will always be incremented, resulting in a endless reconcile loop. Closes: https://github.com/rook/rook/issues/5173 Signed-off-by: Sébastien Han --- cluster/charts/rook-ceph/templates/resources.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index 22bfd1c7b..4be8c928a 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -265,6 +265,8 @@ spec: - force preservePoolsOnDelete: type: boolean + subresources: + status: {} additionalPrinterColumns: - name: ActiveMDS type: string @@ -307,6 +309,8 @@ spec: annotations: {} placement: {} resources: {} + subresources: + status: {} --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition @@ -387,6 +391,8 @@ spec: - force preservePoolsOnDelete: type: boolean + subresources: + status: {} --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition @@ -404,6 +410,8 @@ spec: - objectuser scope: Namespaced version: v1 + subresources: + status: {} --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition @@ -453,6 +461,8 @@ spec: - passive - aggressive - force + subresources: + status: {} --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition @@ -469,6 +479,8 @@ spec: - rv scope: Namespaced version: v1alpha2 + subresources: + status: {} --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition @@ -534,3 +546,5 @@ spec: properties: caps: type: object + subresources: + status: {}