Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions apis/duck/v1/kresource_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ type KRShaped interface {
GetTypeMeta() *metav1.TypeMeta

GetStatus() *Status

GetTopLevelConditionType() apis.ConditionType
Copy link
Copy Markdown
Contributor

@antoineco antoineco May 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too late, but I'm curious why we didn't stick to the current naming here (Happy instead of TopLevel).

}

// Asserts KResource conformance with KRShaped
Expand Down Expand Up @@ -88,3 +90,13 @@ func (t *KResource) GetTypeMeta() *metav1.TypeMeta {
func (t *KResource) GetStatus() *Status {
return &t.Status
}

// GetTopLevelConditionType retrieves the happy condition of this resource. Implements the KRShaped interface.
func (t *KResource) GetTopLevelConditionType() apis.ConditionType {
// Note: KResources are unmarshalled from existing resources. This will only work properly for resources that
// have already been initialized to their type.
if cond := t.Status.GetCondition(apis.ConditionSucceeded); cond != nil {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will not work for un-initialized resources, the condition set will be an empty list.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry I did not see the final impl, this will work but it wil also require all downstreams to update

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have that included as a comment. The idea is that each API shape reports its type and gets initialized. KResource is a generic struct we unmarshal to, but not something that directly manages init.

return apis.ConditionSucceeded
}
return apis.ConditionReady
}
43 changes: 43 additions & 0 deletions apis/duck/v1/kresource_type_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
Copyright 2020 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1

import (
"testing"

"knative.dev/pkg/apis"
)

func TestGetTopLevelCondition(t *testing.T) {
resource := KResource{}

condSet := apis.NewLivingConditionSet("Foo")
mgr := condSet.Manage(resource.GetStatus())
mgr.InitializeConditions()
Comment thread
whaught marked this conversation as resolved.

if resource.GetTopLevelConditionType() != apis.ConditionReady {
t.Error("Expected Ready as happy condition for living condition set type")
}

condSet = apis.NewBatchConditionSet("Foo")
mgr = condSet.Manage(resource.GetStatus())
mgr.InitializeConditions()

if resource.GetTopLevelConditionType() != apis.ConditionSucceeded {
t.Error("Expected Succeeded as happy condition for living condition set type")
}
}
5 changes: 5 additions & 0 deletions apis/test/example/v1alpha1/fiz_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,8 @@ func (f *ClusterFiz) GetTypeMeta() *metav1.TypeMeta {
func (f *ClusterFiz) GetStatus() *duckv1.Status {
return &f.Status.Status
}

// GetTopLevelConditionType retrieves the happy condition of this resource. Implements the KRShaped interface.
func (*ClusterFiz) GetTopLevelConditionType() apis.ConditionType {
return apis.ConditionReady
Comment thread
whaught marked this conversation as resolved.
}
5 changes: 5 additions & 0 deletions apis/test/example/v1alpha1/foo_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,8 @@ func (f *Foo) GetTypeMeta() *metav1.TypeMeta {
func (f *Foo) GetStatus() *duckv1.Status {
return &f.Status.Status
}

// GetTopLevelConditionType retrieves the happy condition of this resource. Implements the KRShaped interface.
func (*Foo) GetTopLevelConditionType() apis.ConditionType {
return apis.ConditionSucceeded
}
5 changes: 5 additions & 0 deletions apis/test/pub/v1alpha1/bar_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,8 @@ func (b *Bar) GetTypeMeta() *metav1.TypeMeta {
func (b *Bar) GetStatus() *duckv1.Status {
return &b.Status.Status
}

// GetTopLevelConditionType retrieves the happy condition of this resource. Implements the KRShaped interface.
func (*Bar) GetTopLevelConditionType() apis.ConditionType {
return apis.ConditionReady
}