Scopes: Adds kinds for browsing the scope node tree. #86975
Conversation
bergquist
added
no-backport
pkg/apis/scope/v0alpha1/types.go
Outdated
| } | ||
|
|
||
| type ScopeNodeSpec struct { | ||
| ParentName string `json:"parentName"` |
There was a problem hiding this comment.
Ideally this would be a pointer so it can be nil. But when it was it caused from here: https://github.com/grafana/grafana/pull/86975/files#diff-2f14ede265a1a7398479d678d07da5e351ab585e62ef22dbadfcc1cde64e02e4R177
There was a problem hiding this comment.
there are examples of using string pointers in k8s code, so it seems like it should be supported.
did you try something like this in SelectableScopeNodeFields?
if obj.Spec.ParentName == nil {
return generic.ObjectMetaFieldsSet(&obj.ObjectMeta, false)
}There was a problem hiding this comment.
Sorry for my lack of knowledge about the apiserver.. But what if I want to query for ScopeNodes with parentName == nil ? Would that work in such case?
That's how I envision finding the root nodes in the tree.
There was a problem hiding this comment.
Sorry for my lack of knowledge about the apiserver
no need to apologize for not knowing something! i'm not sure of the correct approach here either 馃槃
maybe using an empty string would work?
func SelectableScopeNodeFields(obj *scope.ScopeNode) fields.Set {
parentName := ""
if obj.Spec.ParentName != nil {
parentName = *obj.Spec.ParentName
}
return generic.MergeFieldsSets(generic.ObjectMetaFieldsSet(&obj.ObjectMeta, false), fields.Set{
"spec.parentName": parentName,
})
}There was a problem hiding this comment.
Yupp! that worked :)
bergquist
force-pushed
the
scopes_tree_node
branch
2 times, most recently
from
6aec13e
to
ca0ac61
Compare
| func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) { | ||
| if s, ok := obj.(*scope.Scope); ok { | ||
| return labels.Set(s.Labels), SelectableScopeFields(s), nil | ||
| } | ||
| if s, ok := obj.(*scope.ScopeDashboardBinding); ok { | ||
| return labels.Set(s.Labels), SelectableScopeDashboardBindingFields(s), nil | ||
| } | ||
| if s, ok := obj.(*scope.ScopeNode); ok { |
There was a problem hiding this comment.
up to you, but this might be less verbose if it was refactored to a type switch now that there are three types
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
bergquist
force-pushed
the
scopes_tree_node
branch
from
b1061d8
to
947a4e2
Compare
|
|
||
| type ScopeNodeSpec struct { | ||
| //+optional | ||
| ParentName *string `json:"parentName"` |
There was a problem hiding this comment.
Does this need to be a pointer? Would empty string suffice for "No parent", or does null and empty have different meanings?
This is my proposal for the Scope Node data model.
The
ScopeNodeis a tree that can render selected or non selectable items (decided by theisLeafbool).Having
leafTypeandleafNameallows the API to include both scopes, dashboards, apps or any other kind within the tree. While we will focus only on scopes right now we should use this for more things eventually.leftNamecould have a better name that is more clear about referencing another entity identifier.To find the root nodes in the tree I'd like to find all ScopeNode.ParentName that equals "" or nil depending on if the name can be a pointer or not. I think a pointer is a cleaner solution but Im not sure if it would be possible to filter based on it.
As for the API server part... I've just tried to copy as much as possible from the code I see for
scopeandscopedashboard馃槅