Merge pull request #360 from bjwswang/gql

chore: use a more simplified reason Running instead of WorkingRunnig
kubeagi · Dec 13, 2023 · 5059ecf · 5059ecf
2 parents da12bf8 + 679ad16
commit 5059ecf
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git 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
diff --git a/graphql-server/go-server/graph/generated/models_gen.go b/graphql-server/go-server/graph/generated/models_gen.go
diff --git 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
@@ -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
@@ -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