From 854cac6e729d9f681ed6a038371832d594ae8950 Mon Sep 17 00:00:00 2001 From: wawa0210 Date: Tue, 19 Oct 2021 20:06:27 +0800 Subject: [PATCH] refactor execute space event Signed-off-by: wawa0210 --- pkg/apis/cluster/v1alpha1/events.go | 9 +++++++++ pkg/controllers/cluster/cluster_controller.go | 8 +++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 pkg/apis/cluster/v1alpha1/events.go diff --git a/pkg/apis/cluster/v1alpha1/events.go b/pkg/apis/cluster/v1alpha1/events.go new file mode 100644 index 000000000..8f400749d --- /dev/null +++ b/pkg/apis/cluster/v1alpha1/events.go @@ -0,0 +1,9 @@ +package v1alpha1 + +// Define events for execute space objects. +const ( + // EventReasonCreateExecutionSpaceFailed indicates that create execution space failed. + EventReasonCreateExecutionSpaceFailed = "CreateExecutionSpaceFailed" + // EventReasonRemoveExecutionSpaceFailed indicates that remove execution space failed. + EventReasonRemoveExecutionSpaceFailed = "RemoveExecutionSpaceFailed" +) diff --git a/pkg/controllers/cluster/cluster_controller.go b/pkg/controllers/cluster/cluster_controller.go index 6638b4cb6..6183ad14f 100644 --- a/pkg/controllers/cluster/cluster_controller.go +++ b/pkg/controllers/cluster/cluster_controller.go @@ -33,9 +33,7 @@ const ( // sleep between retrying cluster health updates. MonitorRetrySleepTime = 20 * time.Millisecond // HealthUpdateRetry controls the number of retries of writing cluster health update. - HealthUpdateRetry = 5 - eventReasonCreateExecutionNamespaceFailed = "CreateExecutionNamespaceFailed" - eventReasonRemoveExecutionNamespaceFailed = "RemoveExecutionNamespaceFailed" + HealthUpdateRetry = 5 ) // Controller is to sync Cluster. @@ -115,7 +113,7 @@ func (c *Controller) syncCluster(cluster *clusterv1alpha1.Cluster) (controllerru // create execution space err := c.createExecutionSpace(cluster) if err != nil { - c.EventRecorder.Event(cluster, corev1.EventTypeWarning, fmt.Sprintf("Failed %s", eventReasonRemoveExecutionNamespaceFailed), err.Error()) + c.EventRecorder.Event(cluster, corev1.EventTypeWarning, fmt.Sprintf("Failed %s", clusterv1alpha1.EventReasonRemoveExecutionSpaceFailed), err.Error()) return controllerruntime.Result{Requeue: true}, err } @@ -130,7 +128,7 @@ func (c *Controller) removeCluster(cluster *clusterv1alpha1.Cluster) (controller } if err != nil { klog.Errorf("Failed to remove execution space %v, err is %v", cluster.Name, err) - c.EventRecorder.Event(cluster, corev1.EventTypeWarning, fmt.Sprintf("Failed %s", eventReasonCreateExecutionNamespaceFailed), err.Error()) + c.EventRecorder.Event(cluster, corev1.EventTypeWarning, fmt.Sprintf("Failed %s", clusterv1alpha1.EventReasonCreateExecutionSpaceFailed), err.Error()) return controllerruntime.Result{Requeue: true}, err }