From d3d4cd2f204c097779d2d5f81ee8978ae01ed830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 19 Mar 2020 15:13:11 +0100 Subject: [PATCH] ceph: child controller-runtime stop watching for deployment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bump from 0.2 to 0.4 controller-runtime versions which happened during the use of Go Modules (bumping Go version to 1.13) introduced an issue where the deployment annotations keep getting changed during watch update event. The easy fix is to stop watching Deployment objects for now. Signed-off-by: Sébastien Han --- pkg/operator/ceph/object/controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/object/controller.go b/pkg/operator/ceph/object/controller.go index db8a2786e..f073c9e49 100644 --- a/pkg/operator/ceph/object/controller.go +++ b/pkg/operator/ceph/object/controller.go @@ -31,7 +31,6 @@ import ( opconfig "github.com/rook/rook/pkg/operator/ceph/config" opcontroller "github.com/rook/rook/pkg/operator/ceph/controller" "github.com/rook/rook/pkg/operator/k8sutil" - appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -54,8 +53,9 @@ var logger = capnslog.NewPackageLogger("github.com/rook/rook", controllerName) // List of object resources to watch by the controller var objectsToWatch = []runtime.Object{ &corev1.Secret{TypeMeta: metav1.TypeMeta{Kind: "Secret", APIVersion: corev1.SchemeGroupVersion.String()}}, - &appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}}, &v1.Service{TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: v1.SchemeGroupVersion.String()}}, + // Stop watching for Deployment object until https://github.com/rook/rook/issues/5047 is fully resolved + // &appsv1.Deployment{TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: appsv1.SchemeGroupVersion.String()}}, } var cephObjectStoreKind = reflect.TypeOf(cephv1.CephObjectStore{}).Name()