feat: add ownedBy and createdAt for OpenModel #438
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
InftyAI-Agent
added
needs-triage
|
will test locally soon |
googs1025
force-pushed
the
feature/OpenModel_field
branch
3 times, most recently
from
cc8eca3 to
55df089
Compare
root@VM-0-3-ubuntu:/home/ubuntu/llmaz/docs/examples/ollama# kubectl get openmodel -oyaml
apiVersion: v1
items:
- apiVersion: llmaz.io/v1alpha1
kind: OpenModel
metadata:
annotations:
kubectl.kubernetes.io/last-applied-configuration: |
{"apiVersion":"llmaz.io/v1alpha1","kind":"OpenModel","metadata":{"annotations":{},"name":"qwen2-0--5b"},"spec":{"familyName":"qwen2","source":{"uri":"ollama://qwen2:0.5b"}}}
creationTimestamp: "2025-06-03T13:30:42Z"
generation: 2
labels:
llmaz.io/model-family-name: qwen2
name: qwen2-0--5b
resourceVersion: "3586"
uid: 9df4445e-fbbb-4083-b3ff-4591dfc1f95e
spec:
createdAt: "2025-06-03T13:30:42Z"
familyName: qwen2
ownedBy: llmaz
source:
uri: ollama://qwen2:0.5b
kind: List
metadata:
resourceVersion: ""
root@VM-0-3-ubuntu:/home/ubuntu/llmaz/docs/examples/ollama# |
|
/kind feature |
InftyAI-Agent
added
feature
kerthcet
reviewed
Jun 4, 2025
| @@ -73,3 +85,22 @@ func (r *ModelReconciler) SetupWithManager(mgr ctrl.Manager) error { | |||
| For(&coreapi.OpenModel{}). | |||
| Complete(r) | |||
| } | |||
|
|
|||
| // needsUpdated checks if the model needs to be updated. | |||
| func needsUpdated(model *coreapi.OpenModel) (bool, *coreapi.OpenModel) { | |||
There was a problem hiding this comment.
Move them to the webhooks which I believe is the right place. And I think we don't need to set the OwnedBy since we have kubebuilder tag.
There was a problem hiding this comment.
sgtm. I forget that we have OpenModelWebhook... I will change this part
There was a problem hiding this comment.
Back to this again, if I understand correctly, when we put it in the webhook, it seems that model.CreationTimestamp is still empty when we create it. @kerthcet
🤔
func (w *OpenModelWebhook) Default(ctx context.Context, obj runtime.Object) error {
model := obj.(*coreapi.OpenModel)
if model.Labels == nil {
model.Labels = map[string]string{}
}
model.Labels[coreapi.ModelFamilyNameLabelKey] = string(model.Spec.FamilyName)
if model.Spec.CreatedAt == nil {
model.Spec.CreatedAt = &model.CreationTimestamp
}
return nil
}There was a problem hiding this comment.
Yes, we should set it automatically.
googs1025
force-pushed
the
feature/OpenModel_field
branch
from
55df089 to
dcbc1e8
Compare
googs1025
force-pushed
the
feature/OpenModel_field
branch
2 times, most recently
from
4282a0e to
779b7c2
Compare
googs1025
commented
Jun 11, 2025
pkg/webhook/openmodel_webhook.go
Outdated
| @@ -59,6 +60,10 @@ func (w *OpenModelWebhook) Default(ctx context.Context, obj runtime.Object) erro | |||
| model.Labels = map[string]string{} | |||
| } | |||
| model.Labels[coreapi.ModelFamilyNameLabelKey] = string(model.Spec.FamilyName) | |||
| if model.Spec.CreatedAt == nil { | |||
There was a problem hiding this comment.
change to: in webhook , if it is not filled, just set time.Now().
googs1025
force-pushed
the
feature/OpenModel_field
branch
from
779b7c2 to
0915166
Compare
googs1025
commented
Jun 11, 2025
| @@ -48,22 +48,23 @@ var _ = ginkgo.Describe("model default and validation", func() { | |||
| gomega.Expect(k8sClient.Create(ctx, model)).To(gomega.Succeed()) | |||
| gomega.Expect(model).To(gomega.BeComparableTo(tc.wantModel(), | |||
| cmpopts.IgnoreTypes(coreapi.ModelStatus{}), | |||
| cmpopts.IgnoreFields(coreapi.ModelSpec{}, "CreatedAt"), | |||
There was a problem hiding this comment.
Regarding the time field, in order to avoid fake tests, we should avoid checking
kerthcet
reviewed
Jun 13, 2025
pkg/webhook/openmodel_webhook.go
Outdated
| @@ -59,6 +60,10 @@ func (w *OpenModelWebhook) Default(ctx context.Context, obj runtime.Object) erro | |||
| model.Labels = map[string]string{} | |||
| } | |||
| model.Labels[coreapi.ModelFamilyNameLabelKey] = string(model.Spec.FamilyName) | |||
| if model.Spec.CreatedAt == nil { | |||
| now := metav1.Now().Rfc3339Copy() | |||
| model.Spec.CreatedAt = &now | |||
There was a problem hiding this comment.
chango to:
createdAt := ptr.Deref[metav1.Time](model.Spec.CreatedAt, metav1.Now().Rfc3339Copy())
model.Spec.CreatedAt = &createdAt
googs1025
force-pushed
the
feature/OpenModel_field
branch
from
0915166 to
dfb491f
Compare
Signed-off-by: googs1025 <[email protected]>
googs1025
force-pushed
the
feature/OpenModel_field
branch
from
dfb491f to
1190bad
Compare
|
/approve |
InftyAI-Agent
added
the
approved
InftyAI-Agent
added
the
lgtm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it
Which issue(s) this PR fixes
Fixes #435
Special notes for your reviewer
Does this PR introduce a user-facing change?