Skip to content

kube: register metrics api resources #60683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tigrato merged 2 commits into from
Nov 3, 2025
Merged

kube: register metrics api resources #60683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6848cea
kube: register metrics api resources
tigrato Oct 28, 2025
8aa129b
add unit tests
tigrato Oct 29, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ require (
k8s.io/component-base v0.34.1
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.34.1
k8s.io/metrics v0.34.1
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/controller-runtime v0.22.1
sigs.k8s.io/controller-tools v0.17.1
Expand Down Expand Up @@ -628,7 +629,6 @@ require (
gotest.tools/gotestsum v1.13.0 // indirect
k8s.io/component-helpers v0.34.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/metrics v0.34.1 // indirect
mvdan.cc/sh/v3 v3.7.0 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
Expand Down
1 change: 1 addition & 0 deletions integrations/terraform-mwi/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ require (
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/kubectl v0.34.1 // indirect
k8s.io/metrics v0.34.1 // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
mvdan.cc/sh/v3 v3.7.0 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions integrations/terraform-mwi/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3075,6 +3075,8 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
k8s.io/kubectl v0.34.1 h1:1qP1oqT5Xc93K+H8J7ecpBjaz511gan89KO9Vbsh/OI=
k8s.io/kubectl v0.34.1/go.mod h1:JRYlhJpGPyk3dEmJ+BuBiOB9/dAvnrALJEiY/C5qa6A=
k8s.io/metrics v0.34.1 h1:374Rexmp1xxgRt64Bi0TsjAM8cA/Y8skwCoPdjtIslE=
k8s.io/metrics v0.34.1/go.mod h1:Drf5kPfk2NJrlpcNdSiAAHn/7Y9KqxpRNagByM7Ei80=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
Expand Down
1 change: 1 addition & 0 deletions integrations/terraform/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ require (
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
k8s.io/kubectl v0.34.1 // indirect
k8s.io/metrics v0.34.1 // indirect
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
mvdan.cc/sh/v3 v3.7.0 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions integrations/terraform/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3188,6 +3188,8 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
k8s.io/kubectl v0.34.1 h1:1qP1oqT5Xc93K+H8J7ecpBjaz511gan89KO9Vbsh/OI=
k8s.io/kubectl v0.34.1/go.mod h1:JRYlhJpGPyk3dEmJ+BuBiOB9/dAvnrALJEiY/C5qa6A=
k8s.io/metrics v0.34.1 h1:374Rexmp1xxgRt64Bi0TsjAM8cA/Y8skwCoPdjtIslE=
k8s.io/metrics v0.34.1/go.mod h1:Drf5kPfk2NJrlpcNdSiAAHn/7Y9KqxpRNagByM7Ei80=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
Expand Down
11 changes: 11 additions & 0 deletions lib/kube/proxy/scheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ import (
"k8s.io/client-go/discovery"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/metrics/pkg/apis/metrics"
metricsv1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1"
)

const (
Expand Down Expand Up @@ -69,6 +71,15 @@ func init() {
func registerDefaultKubeTypes(s *runtime.Scheme) error {
// Register external types for Scheme
metav1.AddToGroupVersion(s, schema.GroupVersion{Group: "", Version: "v1"})

if err := metrics.AddToScheme(s); err != nil {
return trace.Wrap(err)
}

if err := metricsv1beta1.AddToScheme(s); err != nil {
return trace.Wrap(err)
}

if err := metav1.AddMetaToScheme(s); err != nil {
return trace.Wrap(err)
}
Expand Down
78 changes: 78 additions & 0 deletions lib/kube/proxy/scheme_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ import (
"testing"

"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery"
"k8s.io/client-go/kubernetes"
"k8s.io/metrics/pkg/apis/metrics"
metricsv1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1"

"github.com/gravitational/teleport/lib/utils/log/logtest"
)
Expand Down Expand Up @@ -61,3 +66,76 @@ func (c *clientSet) ServerGroupsAndResources() ([]*metav1.APIGroup, []*metav1.AP
&fakeAPIResource,
}, nil
}

func TestRegisterDefaultKubeTypes(t *testing.T) {
scheme := runtime.NewScheme()
err := registerDefaultKubeTypes(scheme)
require.NoError(t, err)

// Check that some known types are registered
tests := []struct {
gvk schema.GroupVersionKind
expectedType runtime.Object
}{
{
gvk: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Pod"},
expectedType: &corev1.Pod{},
},
{
gvk: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "PodList"},
expectedType: &corev1.PodList{},
},
{
gvk: schema.GroupVersionKind{Group: "metrics.k8s.io", Version: "v1beta1", Kind: "PodMetrics"},
expectedType: &metricsv1beta1.PodMetrics{},
},
{
gvk: schema.GroupVersionKind{Group: "metrics.k8s.io", Version: "v1beta1", Kind: "NodeMetrics"},
expectedType: &metricsv1beta1.NodeMetrics{},
},
{
gvk: schema.GroupVersionKind{Group: "metrics.k8s.io", Version: runtime.APIVersionInternal, Kind: "PodMetrics"},
expectedType: &metrics.PodMetrics{},
},
{
gvk: schema.GroupVersionKind{Group: "metrics.k8s.io", Version: runtime.APIVersionInternal, Kind: "NodeMetrics"},
expectedType: &metrics.NodeMetrics{},
},

// --- metav1 types ---
{
gvk: schema.GroupVersionKind{Group: "meta.k8s.io", Version: "v1", Kind: "PartialObjectMetadata"},
expectedType: &metav1.PartialObjectMetadata{},
},
{
gvk: schema.GroupVersionKind{Group: "meta.k8s.io", Version: "v1", Kind: "PartialObjectMetadataList"},
expectedType: &metav1.PartialObjectMetadataList{},
},
{
gvk: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "Status"},
expectedType: &metav1.Status{},
},
{
gvk: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "APIVersions"},
expectedType: &metav1.APIVersions{},
},
{
gvk: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "APIGroupList"},
expectedType: &metav1.APIGroupList{},
},
{
gvk: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "APIGroup"},
expectedType: &metav1.APIGroup{},
},
{
gvk: schema.GroupVersionKind{Group: "", Version: "v1", Kind: "APIResourceList"},
expectedType: &metav1.APIResourceList{},
},
}

for _, testCase := range tests {
newType, err := scheme.New(testCase.gvk)
require.NoError(t, err, "expected type %v to be registered", testCase.gvk)
require.IsType(t, testCase.expectedType, newType, "expected type %v to be of type %T", testCase.gvk, testCase.expectedType)
}
}
Loading