From 679ad160ef37cc9b9b40a6c3b3116a7f70e764ca Mon Sep 17 00:00:00 2001 From: bjwswang Date: Wed, 13 Dec 2023 02:13:21 +0000 Subject: [PATCH] chore: use a more simplified reason Running instead of WorkingRunnig Signed-off-by: bjwswang --- api/base/v1alpha1/worker.go | 2 +- graphql-server/go-server/graph/generated/generated.go | 2 +- graphql-server/go-server/graph/generated/models_gen.go | 2 +- graphql-server/go-server/graph/schema/worker.graphqls | 2 +- graphql-server/go-server/pkg/model/model.go | 2 -- graphql-server/go-server/pkg/worker/worker.go | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/api/base/v1alpha1/worker.go b/api/base/v1alpha1/worker.go index 4b9a94f65..3901e195e 100644 --- a/api/base/v1alpha1/worker.go +++ b/api/base/v1alpha1/worker.go @@ -63,7 +63,7 @@ func (worker Worker) ReadyCondition() Condition { return Condition{ Type: TypeReady, Status: corev1.ConditionTrue, - Reason: "WorkerRunning", + Reason: "Running", Message: "Work has been actively running", LastTransitionTime: metav1.Now(), LastSuccessfulTime: metav1.Now(), diff --git a/graphql-server/go-server/graph/generated/generated.go b/graphql-server/go-server/graph/generated/generated.go index 4a53ae227..c3727a744 100644 --- a/graphql-server/go-server/graph/generated/generated.go +++ b/graphql-server/go-server/graph/generated/generated.go @@ -4501,7 +4501,7 @@ type Worker { 规则: 目前分为四种状态 - Unknown: 未知 - Pending: 发布中 - - WorkerRunning: 已发布 + - Running: 已发布 - Error: 异常 """ status: String diff --git a/graphql-server/go-server/graph/generated/models_gen.go b/graphql-server/go-server/graph/generated/models_gen.go index 2aae74774..5aec547d7 100644 --- a/graphql-server/go-server/graph/generated/models_gen.go +++ b/graphql-server/go-server/graph/generated/models_gen.go @@ -1140,7 +1140,7 @@ type Worker struct { // 规则: 目前分为四种状态 // - Unknown: 未知 // - Pending: 发布中 - // - WorkerRunning: 已发布 + // - Running: 已发布 // - Error: 异常 Status *string `json:"status,omitempty"` } diff --git a/graphql-server/go-server/graph/schema/worker.graphqls b/graphql-server/go-server/graph/schema/worker.graphqls index cfc800c91..827f1bd47 100644 --- a/graphql-server/go-server/graph/schema/worker.graphqls +++ b/graphql-server/go-server/graph/schema/worker.graphqls @@ -88,7 +88,7 @@ type Worker { 规则: 目前分为四种状态 - Unknown: 未知 - Pending: 发布中 - - WorkerRunning: 已发布 + - Running: 已发布 - Error: 异常 """ status: String diff --git a/graphql-server/go-server/pkg/model/model.go b/graphql-server/go-server/pkg/model/model.go index cd5403b5b..383fade04 100644 --- a/graphql-server/go-server/pkg/model/model.go +++ b/graphql-server/go-server/pkg/model/model.go @@ -52,8 +52,6 @@ func obj2model(obj *unstructured.Unstructured) *generated.Model { // conditioned status condition := model.Status.GetCondition(v1alpha1.TypeReady) updateTime := condition.LastTransitionTime.Time - - // Unknown,Pending ,WorkerRunning ,Error status := string(condition.Status) var systemModel bool diff --git a/graphql-server/go-server/pkg/worker/worker.go b/graphql-server/go-server/pkg/worker/worker.go index e068b4b84..e2a8c70a5 100644 --- a/graphql-server/go-server/pkg/worker/worker.go +++ b/graphql-server/go-server/pkg/worker/worker.go @@ -54,7 +54,7 @@ func worker2model(ctx context.Context, c dynamic.Interface, obj *unstructured.Un condition := worker.Status.GetCondition(v1alpha1.TypeReady) updateTime := condition.LastTransitionTime.Time - // Unknown,Pending ,WorkerRunning ,Error + // Unknown,Pending ,Running ,Error status := string(condition.Reason) // resources