From 21c1b7fc084a6a318e3d7bd09c69e181dd8eca60 Mon Sep 17 00:00:00 2001 From: yandongxiao Date: Wed, 17 Jan 2024 15:56:49 +0800 Subject: [PATCH] [Bugfix] Add annotations content to svc object before calculate service hash Signed-off-by: yandongxiao --- pkg/common/resource_utils/service.go | 2 +- pkg/common/resource_utils/service_test.go | 8 ++++---- pkg/subcontrollers/cn/cn_controller.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/common/resource_utils/service.go b/pkg/common/resource_utils/service.go index e462e11e..4a055301 100644 --- a/pkg/common/resource_utils/service.go +++ b/pkg/common/resource_utils/service.go @@ -111,7 +111,7 @@ func BuildExternalService(object object.StarRocksObject, spec srapi.SpecInterfac } // set Ports field before calculate resource hash svc.Spec.Ports = ports - + svc.Annotations = anno anno[srapi.ComponentResourceHash] = hash.HashObject(serviceHashObject(&svc)) svc.Annotations = anno return svc diff --git a/pkg/common/resource_utils/service_test.go b/pkg/common/resource_utils/service_test.go index 9cb65809..98b34915 100644 --- a/pkg/common/resource_utils/service_test.go +++ b/pkg/common/resource_utils/service_test.go @@ -103,7 +103,7 @@ func TestBuildExternalService_ForStarRocksWarehouse(t *testing.T) { Name: "test-warehouse-cn-service", Namespace: "default", Annotations: map[string]string{ - srapi.ComponentResourceHash: "3383045221", + srapi.ComponentResourceHash: "1671283410", }, OwnerReferences: func() []metav1.OwnerReference { ref := metav1.NewControllerRef(warehouse, warehouse.GroupVersionKind()) @@ -218,7 +218,7 @@ func TestBuildExternalService_ForStarRocksCluster(t *testing.T) { Name: "test-fe-service", Namespace: "default", Annotations: map[string]string{ - srapi.ComponentResourceHash: "2185539013", + srapi.ComponentResourceHash: "237701170", }, OwnerReferences: func() []metav1.OwnerReference { ref := metav1.NewControllerRef(src, src.GroupVersionKind()) @@ -254,7 +254,7 @@ func TestBuildExternalService_ForStarRocksCluster(t *testing.T) { Name: "test-be-service", Namespace: "default", Annotations: map[string]string{ - srapi.ComponentResourceHash: "2959781285", + srapi.ComponentResourceHash: "1565507602", }, OwnerReferences: func() []metav1.OwnerReference { ref := metav1.NewControllerRef(src, src.GroupVersionKind()) @@ -287,7 +287,7 @@ func TestBuildExternalService_ForStarRocksCluster(t *testing.T) { Name: "test-cn-service", Namespace: "default", Annotations: map[string]string{ - srapi.ComponentResourceHash: "2677312175", + srapi.ComponentResourceHash: "2848177640", }, OwnerReferences: func() []metav1.OwnerReference { ref := metav1.NewControllerRef(src, src.GroupVersionKind()) diff --git a/pkg/subcontrollers/cn/cn_controller.go b/pkg/subcontrollers/cn/cn_controller.go index f05ea035..07bd1445 100644 --- a/pkg/subcontrollers/cn/cn_controller.go +++ b/pkg/subcontrollers/cn/cn_controller.go @@ -240,7 +240,7 @@ func (cc *CnController) UpdateStatus(ctx context.Context, object object.StarRock statefulSetName := load.Name(object.AliasName, cnSpec) namespacedName := types.NamespacedName{Namespace: object.Namespace, Name: statefulSetName} if err := cc.k8sClient.Get(ctx, namespacedName, &st); apierrors.IsNotFound(err) { - logger.Error(err, "get statefulset failed") + logger.Info("cn statefulset is not found") return nil }