Merge pull request #589 from bjwswang/bug

fix: avoid to update resource status with explictly status check
kubeagi · Jan 19, 2024 · 599497a · 599497a
2 parents deeca83 + e07201e
commit 599497a
Show file tree

Hide file tree

Showing 14 changed files with 304 additions and 131 deletions.
diff --git a/api/base/v1alpha1/datasource.go b/api/base/v1alpha1/datasource.go
@@ -16,6 +16,11 @@ limitations under the License.
 
 package v1alpha1
 
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
 const (
 	LabelDatasourceType = Group + "/datasource-type"
 )
@@ -41,3 +46,40 @@ func (ds DatasourceSpec) Type() DatasourceType {
 		return DatasourceTypeUnknown
 	}
 }
+
+func (datasource Datasource) ReadyCondition() Condition {
+	currCon := datasource.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionTrue && currCon.Reason == ReasonAvailable {
+		return currCon
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionTrue,
+		Reason:             ReasonAvailable,
+		Message:            "Check Success",
+		LastTransitionTime: metav1.Now(),
+		LastSuccessfulTime: metav1.Now(),
+	}
+}
+
+func (datasource Datasource) ErrorCondition(msg string) Condition {
+	currCon := datasource.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionFalse && currCon.Reason == ReasonUnavailable && currCon.Message == msg {
+		return currCon
+	}
+	// keep original LastSuccessfulTime if have
+	lastSuccessfulTime := metav1.Now()
+	if currCon.LastSuccessfulTime.IsZero() {
+		lastSuccessfulTime = currCon.LastSuccessfulTime
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionFalse,
+		Reason:             ReasonUnavailable,
+		Message:            msg,
+		LastSuccessfulTime: lastSuccessfulTime,
+		LastTransitionTime: metav1.Now(),
+	}
+}
diff --git a/api/base/v1alpha1/embedder.go b/api/base/v1alpha1/embedder.go
@@ -19,6 +19,8 @@ package v1alpha1
 import (
 	"context"
 
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/dynamic"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -75,3 +77,40 @@ func (e Embedder) Get3rdPartyModels() []string {
 
 	return []string{}
 }
+
+func (e Embedder) ReadyCondition(msg string) Condition {
+	currCon := e.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionTrue && currCon.Reason == ReasonAvailable && currCon.Message == msg {
+		return currCon
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionTrue,
+		Reason:             ReasonAvailable,
+		Message:            msg,
+		LastTransitionTime: metav1.Now(),
+		LastSuccessfulTime: metav1.Now(),
+	}
+}
+
+func (e Embedder) ErrorCondition(msg string) Condition {
+	currCon := e.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionFalse && currCon.Reason == ReasonUnavailable && currCon.Message == msg {
+		return currCon
+	}
+	// keep original LastSuccessfulTime if have
+	lastSuccessfulTime := metav1.Now()
+	if currCon.LastSuccessfulTime.IsZero() {
+		lastSuccessfulTime = currCon.LastSuccessfulTime
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionFalse,
+		Reason:             ReasonUnavailable,
+		Message:            msg,
+		LastSuccessfulTime: lastSuccessfulTime,
+		LastTransitionTime: metav1.Now(),
+	}
+}
diff --git a/api/base/v1alpha1/llm.go b/api/base/v1alpha1/llm.go
@@ -19,6 +19,8 @@ package v1alpha1
 import (
 	"context"
 
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/dynamic"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -84,3 +86,40 @@ func (llm LLM) Get3rdPartyModels() []string {
 	}
 	return []string{}
 }
+
+func (llm LLM) ReadyCondition(msg string) Condition {
+	currCon := llm.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionTrue && currCon.Reason == ReasonAvailable && currCon.Message == msg {
+		return currCon
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionTrue,
+		Reason:             ReasonAvailable,
+		Message:            msg,
+		LastTransitionTime: metav1.Now(),
+		LastSuccessfulTime: metav1.Now(),
+	}
+}
+
+func (llm LLM) ErrorCondition(msg string) Condition {
+	currCon := llm.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionFalse && currCon.Reason == ReasonUnavailable && currCon.Message == msg {
+		return currCon
+	}
+	// keep original LastSuccessfulTime if have
+	lastSuccessfulTime := metav1.Now()
+	if currCon.LastSuccessfulTime.IsZero() {
+		lastSuccessfulTime = currCon.LastSuccessfulTime
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionFalse,
+		Reason:             ReasonUnavailable,
+		Message:            msg,
+		LastSuccessfulTime: lastSuccessfulTime,
+		LastTransitionTime: metav1.Now(),
+	}
+}
diff --git a/api/base/v1alpha1/model.go b/api/base/v1alpha1/model.go
@@ -19,6 +19,9 @@ package v1alpha1
 import (
 	"fmt"
 	"strings"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -58,3 +61,40 @@ func (model Model) FullPath() string {
 func (model Model) ObjectPath() string {
 	return fmt.Sprintf("model/%s/", model.Name)
 }
+
+func (model Model) ReadyCondition() Condition {
+	currCon := model.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionTrue && currCon.Reason == ReasonAvailable {
+		return currCon
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionTrue,
+		Reason:             ReasonAvailable,
+		Message:            "Check Success",
+		LastTransitionTime: metav1.Now(),
+		LastSuccessfulTime: metav1.Now(),
+	}
+}
+
+func (model Model) ErrorCondition(msg string) Condition {
+	currCon := model.Status.GetCondition(TypeReady)
+	// return current condition if condition not changed
+	if currCon.Status == corev1.ConditionFalse && currCon.Reason == ReasonUnavailable && currCon.Message == msg {
+		return currCon
+	}
+	// keep original LastSuccessfulTime if have
+	lastSuccessfulTime := metav1.Now()
+	if currCon.LastSuccessfulTime.IsZero() {
+		lastSuccessfulTime = currCon.LastSuccessfulTime
+	}
+	return Condition{
+		Type:               TypeReady,
+		Status:             corev1.ConditionFalse,
+		Reason:             ReasonUnavailable,
+		Message:            msg,
+		LastSuccessfulTime: lastSuccessfulTime,
+		LastTransitionTime: metav1.Now(),
+	}
+}
diff --git a/apiserver/graph/generated/generated.go b/apiserver/graph/generated/generated.go
diff --git a/apiserver/graph/generated/models_gen.go b/apiserver/graph/generated/models_gen.go
diff --git a/apiserver/graph/schema/entrypoint.graphqls b/apiserver/graph/schema/entrypoint.graphqls
@@ -72,6 +72,7 @@ type TypedObjectReference {
     apiGroup: String
     kind: String!
     name: String!
+    displayName: String
     namespace: String
 }
 

diff --git a/apiserver/pkg/common/common.go b/apiserver/pkg/common/common.go
@@ -221,3 +221,12 @@ func PagePosition(page, size, total int) (int, int) {
 	}
 	return start, end
 }
+
+func TypedObjectReferenceToInput(ref generated.TypedObjectReference) generated.TypedObjectReferenceInput {
+	return generated.TypedObjectReferenceInput{
+		APIGroup:  ref.APIGroup,
+		Kind:      ref.Kind,
+		Namespace: ref.Namespace,
+		Name:      ref.Name,
+	}
+}