diff --git a/go.mod b/go.mod index 54a9aa67c..66c57af8b 100644 --- a/go.mod +++ b/go.mod @@ -35,8 +35,8 @@ require ( k8s.io/client-go v0.30.2 k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.30.2 - kmodules.xyz/client-go v0.30.42 - kmodules.xyz/resource-metadata v0.24.0 + kmodules.xyz/client-go v0.30.43 + kmodules.xyz/resource-metadata v0.24.1-0.20241225081542-68efe80753bd kmodules.xyz/sets v0.29.0 kubepack.dev/chart-doc-gen v0.4.7 kubepack.dev/kubepack v0.29.2-0.20240519151029-6ba83ceff9d4 diff --git a/go.sum b/go.sum index 7ca74f575..1bea7e945 100644 --- a/go.sum +++ b/go.sum @@ -1156,8 +1156,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= kmodules.xyz/apply v0.29.0 h1:0OXGfE2IPuvXHk6uI9zp6KCYdBibx8mK4PEl0g3LZ44= kmodules.xyz/apply v0.29.0/go.mod h1:bwToXErB+DC7/EEWjQVARCSbJBjGx5hIEuV1n0tC73g= -kmodules.xyz/client-go v0.30.42 h1:79x66I8betRJtmFzKS46ujXzXVKAxpXNsm32ayNxTEA= -kmodules.xyz/client-go v0.30.42/go.mod h1:ZOxyEdoSZByjZLkzSM3Q8p1zXMayflK7jQQnWMG2Yj8= +kmodules.xyz/client-go v0.30.43 h1:ygH5e1+0oht4YV9NyT42YoWAlp9wrAUMH6FsB9vAlbk= +kmodules.xyz/client-go v0.30.43/go.mod h1:T9Kiu20wXEn65dLBQeegf4+y7oahJBR9ZJO2zGEVLIY= kmodules.xyz/go-containerregistry v0.0.12 h1:Tl32QGmSqRVm9PUEb/f3dgDeu9zW5fVzt3qmAFIE37I= kmodules.xyz/go-containerregistry v0.0.12/go.mod h1:KgeNg0hDsgeda+qc0NzWk0iVRdF0+ZIg/oRzGoYh78I= kmodules.xyz/monitoring-agent-api v0.30.3 h1:DVGwcRvtaTmRA7Wj4PJ5xR5ADzLo/IB3X2XmAJikbEo= @@ -1168,8 +1168,8 @@ kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g= kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg= kmodules.xyz/prober v0.29.0/go.mod h1:UtK+HKyI1lFLEKX+HFLyOCVju6TO93zv3kwGpzqmKOo= -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/schema-checker v0.4.2 h1:tAbxEtM759GxDM/3sQi/+OKKwUsEF+Ih4KReV3Eb/Xw= diff --git a/vendor/kmodules.xyz/client-go/api/v1/object.go b/vendor/kmodules.xyz/client-go/api/v1/object.go index 073c8141e..92035935a 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/object.go +++ b/vendor/kmodules.xyz/client-go/api/v1/object.go @@ -27,7 +27,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ) -// TypedObjectReference represents an typed namespaced object. +// TypeReference represents an object type. +type TypeReference struct { + APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"` + Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"` +} + +// TypedObjectReference represents a typed namespaced object. type TypedObjectReference struct { APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"` Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"` diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go index dcf3b711c..303ef0d24 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go @@ -475,6 +475,22 @@ func (in *TimeOfDay) DeepCopy() *TimeOfDay { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *TypeReference) DeepCopyInto(out *TypeReference) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TypeReference. +func (in *TypeReference) DeepCopy() *TypeReference { + if in == nil { + return nil + } + out := new(TypeReference) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TypedObjectReference) DeepCopyInto(out *TypedObjectReference) { *out = *in 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/modules.txt b/vendor/modules.txt index 22a1f191a..28888304f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1764,7 +1764,7 @@ kmodules.xyz/apiversion # kmodules.xyz/apply v0.29.0 ## explicit; go 1.21.5 kmodules.xyz/apply -# kmodules.xyz/client-go v0.30.42 +# kmodules.xyz/client-go v0.30.43 ## explicit; go 1.22.0 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -1798,7 +1798,7 @@ kmodules.xyz/offshoot-api/api/v2 # kmodules.xyz/prober v0.29.0 ## explicit; go 1.21.5 kmodules.xyz/prober/api/v1 -# 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/meta kmodules.xyz/resource-metadata/apis/meta/v1alpha1