From 844df0d871787ca1805d9528a6b9ad4397718927 Mon Sep 17 00:00:00 2001 From: Harold Cheng Date: Thu, 5 Dec 2024 11:22:05 +0800 Subject: [PATCH] more deletion --- pkg/controller/instanceset/pod_role_event_handler.go | 2 +- pkg/controller/instanceset/types.go | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkg/controller/instanceset/pod_role_event_handler.go b/pkg/controller/instanceset/pod_role_event_handler.go index 26eca264bb07..5857fdda8ffa 100644 --- a/pkg/controller/instanceset/pod_role_event_handler.go +++ b/pkg/controller/instanceset/pod_role_event_handler.go @@ -74,7 +74,7 @@ func (h *PodRoleEventHandler) Handle(cli client.Client, reqCtx intctrlutil.Reque // HACK: to support kb-agent probe event event = h.transformKBAgentProbeEvent(reqCtx.Log, event) - filePaths := []string{readinessProbeEventFieldPath, legacyEventFieldPath, lorryEventFieldPath} + filePaths := []string{legacyEventFieldPath, lorryEventFieldPath} if !slices.Contains(filePaths, event.InvolvedObject.FieldPath) || event.Reason != checkRoleOperation { return nil } diff --git a/pkg/controller/instanceset/types.go b/pkg/controller/instanceset/types.go index 45f7f8bb0b70..248474ff9860 100644 --- a/pkg/controller/instanceset/types.go +++ b/pkg/controller/instanceset/types.go @@ -25,17 +25,6 @@ const ( RoleLabelKey = "kubeblocks.io/role" AccessModeLabelKey = "workloads.kubeblocks.io/access-mode" - - LegacyRSMFinalizerName = "rsm.workloads.kubeblocks.io/finalizer" - - roleProbeContainerName = "kb-role-probe" - usernameCredentialVarName = "KB_RSM_USERNAME" - passwordCredentialVarName = "KB_RSM_PASSWORD" - servicePortVarName = "KB_RSM_SERVICE_PORT" - actionSvcListVarName = "KB_RSM_ACTION_SVC_LIST" - RoleUpdateMechanismVarName = "KB_RSM_ROLE_UPDATE_MECHANISM" - roleProbeTimeoutVarName = "KB_RSM_ROLE_PROBE_TIMEOUT" - readinessProbeEventFieldPath = "spec.containers{" + roleProbeContainerName + "}" ) const (