diff --git a/go.mod b/go.mod index 51f9cd675..8cf0172b5 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( kmodules.xyz/go-containerregistry v0.0.12 kmodules.xyz/monitoring-agent-api v0.30.4 kmodules.xyz/offshoot-api v0.30.1 - kmodules.xyz/resource-metadata v0.24.0 + kmodules.xyz/resource-metadata v0.24.1-0.20241225081542-68efe80753bd kmodules.xyz/resource-metrics v0.30.5 kmodules.xyz/resource-metrics/utils v0.30.4 kmodules.xyz/sets v0.29.0 diff --git a/go.sum b/go.sum index 35f71bfa9..4e99605d4 100644 --- a/go.sum +++ b/go.sum @@ -939,8 +939,8 @@ kmodules.xyz/monitoring-agent-api v0.30.4 h1:6CTKxYJKpWDsDYb0WRBHGFoW3xQof05d+W8 kmodules.xyz/monitoring-agent-api v0.30.4/go.mod h1:ZuTQ5uGi6H80QLsOTuuC7m58dfXDGUv0YB+s059gnr4= kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI= kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g= -kmodules.xyz/resource-metadata v0.24.0 h1:kdj7Sx67V0LIePE4BsgtAoKFsClg/L0xtiEeEqT+zx8= -kmodules.xyz/resource-metadata v0.24.0/go.mod h1:PEwsZsPeCN0a77xfZzIr+QLL4SbeOIPZ9kqBaQllZTk= +kmodules.xyz/resource-metadata v0.24.1-0.20241225081542-68efe80753bd h1:w2C5p2MzHFzFcTiJRH4p2AvLkAOwkA18ES+1SrazJoI= +kmodules.xyz/resource-metadata v0.24.1-0.20241225081542-68efe80753bd/go.mod h1:PEwsZsPeCN0a77xfZzIr+QLL4SbeOIPZ9kqBaQllZTk= kmodules.xyz/resource-metrics v0.30.5 h1:ZhpGeR9DCz1HTrKUg/mWhr95wlFzCPRdgVAqwaggy1o= kmodules.xyz/resource-metrics v0.30.5/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ= kmodules.xyz/resource-metrics/utils v0.30.4 h1:bJS/x0Qr7N1FFdxugFbzZ/Es6HVs4ptsFlhkmgj3jac= diff --git a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go index 3ea281569..7d41df01b 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go @@ -19880,8 +19880,9 @@ func schema_resource_metadata_apis_ui_v1alpha1_ActionTemplateGroupFilter(ref com Properties: map[string]spec.Schema{ "name": { SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", + Default: "", + Type: []string{"string"}, + Format: "", }, }, "items": { @@ -19899,8 +19900,15 @@ func schema_resource_metadata_apis_ui_v1alpha1_ActionTemplateGroupFilter(ref com }, }, }, + "show": { + SchemaProps: spec.SchemaProps{ + Default: false, + Type: []string{"boolean"}, + Format: "", + }, + }, }, - Required: []string{"items"}, + Required: []string{"name", "show"}, }, }, } @@ -21298,8 +21306,15 @@ func schema_resource_metadata_apis_ui_v1alpha1_ResourcePageOutlineFilter(ref com }, }, }, + "show": { + SchemaProps: spec.SchemaProps{ + Default: false, + Type: []string{"boolean"}, + Format: "", + }, + }, }, - Required: []string{"name"}, + Required: []string{"name", "show"}, }, }, Dependencies: []string{ @@ -21319,6 +21334,13 @@ func schema_resource_metadata_apis_ui_v1alpha1_SectionOutlineFilter(ref common.R Format: "", }, }, + "show": { + SchemaProps: spec.SchemaProps{ + Default: false, + Type: []string{"boolean"}, + Format: "", + }, + }, "info": { SchemaProps: spec.SchemaProps{ Default: false, @@ -21349,7 +21371,7 @@ func schema_resource_metadata_apis_ui_v1alpha1_SectionOutlineFilter(ref common.R }, }, }, - Required: []string{"info", "insight"}, + Required: []string{"show", "info", "insight"}, }, }, } diff --git a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_helpers.go b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_helpers.go index c77419fe9..0643993eb 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_helpers.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_helpers.go @@ -24,6 +24,7 @@ func (a ResourceOutlineFilterSpec) GetPage(name string) ResourcePageOutlineFilte } return ResourcePageOutlineFilter{ Name: name, + Show: false, Sections: nil, } } @@ -36,6 +37,7 @@ func (a ResourceOutlineFilterSpec) GetAction(name string) ActionTemplateGroupFil } return ActionTemplateGroupFilter{ Name: name, + Show: false, Items: nil, } } @@ -48,6 +50,7 @@ func (a ResourcePageOutlineFilter) GetSection(name string) SectionOutlineFilter } return SectionOutlineFilter{ Name: name, + Show: false, Blocks: nil, } } diff --git a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_types.go b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_types.go index 29066ae58..d14146834 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_types.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/resourceoutlinefilter_types.go @@ -54,15 +54,18 @@ type ResourceOutlineFilterSpec struct { type ResourcePageOutlineFilter struct { Name string `json:"name"` Sections []SectionOutlineFilter `json:"sections,omitempty"` + Show bool `json:"show"` } type ActionTemplateGroupFilter struct { - Name string `json:"name,omitempty"` - Items map[string]bool `json:"items"` + Name string `json:"name"` + Items map[string]bool `json:"items,omitempty"` + Show bool `json:"show"` } type SectionOutlineFilter struct { Name string `json:"name,omitempty"` + Show bool `json:"show"` Info bool `json:"info"` Insight bool `json:"insight"` Blocks map[string]bool `json:"blocks,omitempty"` diff --git a/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceoutlinefilters.yaml b/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceoutlinefilters.yaml index 403cbb0cf..12c0090f6 100644 --- a/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceoutlinefilters.yaml +++ b/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_resourceoutlinefilters.yaml @@ -41,8 +41,11 @@ spec: type: object name: type: string + show: + type: boolean required: - - items + - name + - show type: object type: array header: @@ -65,13 +68,19 @@ spec: type: boolean name: type: string + show: + type: boolean required: - info - insight + - show type: object type: array + show: + type: boolean required: - name + - show type: object type: array resource: diff --git a/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceoutlinefilters.yaml b/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceoutlinefilters.yaml index 708758f75..1ab52300a 100644 --- a/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceoutlinefilters.yaml +++ b/vendor/kmodules.xyz/resource-metadata/crds/ui.k8s.appscode.com_resourceoutlinefilters.yaml @@ -41,8 +41,11 @@ spec: type: object name: type: string + show: + type: boolean required: - - items + - name + - show type: object type: array header: @@ -65,13 +68,19 @@ spec: type: boolean name: type: string + show: + type: boolean required: - info - insight + - show type: object type: array + show: + type: boolean required: - name + - show type: object type: array resource: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/meta.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/meta.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml index 5366ef9ec..ec5570117 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/meta.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/meta.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml @@ -64,8 +64,11 @@ spec: type: object name: type: string + show: + type: boolean required: - - items + - name + - show type: object type: array header: @@ -88,13 +91,19 @@ spec: type: boolean name: type: string + show: + type: boolean required: - info - insight + - show type: object type: array + show: + type: boolean required: - name + - show type: object type: array resource: diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml index 43dcef0f5..702967314 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/ui.k8s.appscode.com/v1alpha1/resourceoutlinefilters.yaml @@ -64,8 +64,11 @@ spec: type: object name: type: string + show: + type: boolean required: - - items + - name + - show type: object type: array header: @@ -88,13 +91,19 @@ spec: type: boolean name: type: string + show: + type: boolean required: - info - insight + - show type: object type: array + show: + type: boolean required: - name + - show type: object type: array resource: diff --git a/vendor/kmodules.xyz/resource-metadata/pkg/layouts/filter.go b/vendor/kmodules.xyz/resource-metadata/pkg/layouts/filter.go index c05fa4a30..492ee8179 100644 --- a/vendor/kmodules.xyz/resource-metadata/pkg/layouts/filter.go +++ b/vendor/kmodules.xyz/resource-metadata/pkg/layouts/filter.go @@ -49,6 +49,7 @@ func GetDefaultResourceOutlineFilter(kc client.Client, outline *rsapi.ResourceOu for _, ag := range ed.Spec.UI.Actions { ag2 := uiapi.ActionTemplateGroupFilter{ Name: ag.Name, + Show: true, Items: make(map[string]bool, len(ag.Items)), } for _, a := range ag.Items { @@ -95,12 +96,14 @@ func GetDefaultResourceOutlineFilter(kc client.Client, outline *rsapi.ResourceOu for _, pageOutline := range pages { page := uiapi.ResourcePageOutlineFilter{ Name: pageOutline.Name, + Show: true, Sections: make([]uiapi.SectionOutlineFilter, 0, len(pageOutline.Sections)), } for _, sectionOutline := range pageOutline.Sections { section := uiapi.SectionOutlineFilter{ Name: sectionOutline.Name, + Show: true, Info: sectionOutline.Info != nil, Insight: sectionOutline.Insight != nil, } diff --git a/vendor/kmodules.xyz/resource-metadata/pkg/layouts/lib.go b/vendor/kmodules.xyz/resource-metadata/pkg/layouts/lib.go index b06116db3..751c59767 100644 --- a/vendor/kmodules.xyz/resource-metadata/pkg/layouts/lib.go +++ b/vendor/kmodules.xyz/resource-metadata/pkg/layouts/lib.go @@ -201,6 +201,9 @@ func GetResourceLayout(kc client.Client, outline *rsapi.ResourceOutline) (*rsapi result.Spec.UI.Actions = make([]*shared.ActionTemplateGroup, 0, len(ed.Spec.UI.Actions)) for _, ag := range ed.Spec.UI.Actions { agFilter := filter.Spec.GetAction(ag.Name) + if !agFilter.Show { + continue + } ag2 := shared.ActionTemplateGroup{ ActionInfo: ag.ActionInfo, Items: make([]shared.ActionTemplate, 0, len(ag.Items)), @@ -280,6 +283,9 @@ func GetResourceLayout(kc client.Client, outline *rsapi.ResourceOutline) (*rsapi for _, pageOutline := range pages { pageFilter := filter.Spec.GetPage(pageOutline.Name) + if !pageFilter.Show { + continue + } page := rsapi.ResourcePageLayout{ Name: pageOutline.Name, RequiredFeatureSets: pageOutline.RequiredFeatureSets, @@ -287,6 +293,9 @@ func GetResourceLayout(kc client.Client, outline *rsapi.ResourceOutline) (*rsapi } for _, sectionOutline := range pageOutline.Sections { sectionFilter := pageFilter.GetSection(sectionOutline.Name) + if !sectionFilter.Show { + continue + } section := rsapi.SectionLayout{ Name: sectionOutline.Name, diff --git a/vendor/modules.txt b/vendor/modules.txt index a7f4f4fc0..d8237d068 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2052,7 +2052,7 @@ kmodules.xyz/monitoring-agent-api/client kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v2 kmodules.xyz/offshoot-api/util -# kmodules.xyz/resource-metadata v0.24.0 +# kmodules.xyz/resource-metadata v0.24.1-0.20241225081542-68efe80753bd ## explicit; go 1.22.1 kmodules.xyz/resource-metadata/apis/core/install kmodules.xyz/resource-metadata/apis/core/v1alpha1