fix: use upstream representation of GroupVersionKind

Author: Duologic

pkg/customresourcestate/config.go

@@ -59,7 +59,7 @@ type Resource struct {
 	MetricNamePrefix *string `yaml:"metricNamePrefix" json:"metricNamePrefix"`
 
 	// GroupVersionKind of the custom resource to be monitored.
-	GroupVersionKind GroupVersionKind `yaml:"groupVersionKind" json:"groupVersionKind"`
+	GroupVersionKind schema.GroupVersionKind `yaml:"groupVersionKind" json:"groupVersionKind"`
 
 	// ResourcePlural sets the plural name of the resource. Defaults to the plural version of the Kind according to flect.Pluralize.
 	ResourcePlural string `yaml:"resourcePlural" json:"resourcePlural"`
@@ -89,17 +89,6 @@ func (r Resource) GetResourceName() string {
 	return strings.ToLower(flect.Pluralize(r.GroupVersionKind.Kind))
 }
 
-// GroupVersionKind is the Kubernetes group, version, and kind of a resource.
-type GroupVersionKind struct {
-	Group   string `yaml:"group" json:"group"`
-	Version string `yaml:"version" json:"version"`
-	Kind    string `yaml:"kind" json:"kind"`
-}
-
-func (gvk GroupVersionKind) String() string {
-	return fmt.Sprintf("%s_%s_%s", gvk.Group, gvk.Version, gvk.Kind)
-}
-
 // Labels is common configuration of labels to add to metrics.
 type Labels struct {
 	// CommonLabels are added to all metrics.
@@ -194,7 +183,7 @@ func FromConfig(decoder ConfigDecoder, discovererInstance *discovery.CRDiscovere
 			}
 			for _, resolved /* GVKP */ := range resolvedSet {
 				// Set their G** attributes to various resolutions of the GVK.
-				resource.GroupVersionKind = GroupVersionKind(resolved.GroupVersionKind)
+				resource.GroupVersionKind = schema.GroupVersionKind(resolved.GroupVersionKind)
 				// Set the plural name of the resource based on the extracted value from the same field in the CRD schema.
 				resource.ResourcePlural = resolved.Plural
 				resolvedGVKPs = append(resolvedGVKPs, resource)

pkg/customresourcestate/custom_resource_metrics_test.go

@@ -39,7 +39,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
 			// https://github.com/kubernetes/kube-state-metrics/issues/1886
 			name: "cr metric with dynamic metric type",
 			r: Resource{
-				GroupVersionKind: GroupVersionKind{
+				GroupVersionKind: schema.GroupVersionKind{
 					Group:   "apps",
 					Version: "v1",
 					Kind:    "Deployment",
@@ -83,7 +83,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
 				Families: []compiledFamily{
 					{
 						Name: "kube_customresource_test_metrics",
-						Help: "metrics for testing for apps_v1_Deployment",
+						Help: "metrics for testing for apps/v1, Kind=Deployment",
 						Each: &compiledInfo{},
 						Labels: map[string]string{
 							"customresource_group":   "apps",
@@ -101,7 +101,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
 		{
 			name: "cr metric with custom prefix",
 			r: Resource{
-				GroupVersionKind: GroupVersionKind{
+				GroupVersionKind: schema.GroupVersionKind{
 					Group:   "apps",
 					Version: "v1",
 					Kind:    "Deployment",
@@ -146,7 +146,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
 				Families: []compiledFamily{
 					{
 						Name: "apps_deployment_test_metrics",
-						Help: "metrics for testing for apps_v1_Deployment",
+						Help: "metrics for testing for apps/v1, Kind=Deployment",
 						Each: &compiledInfo{},
 						Labels: map[string]string{
 							"customresource_group":   "apps",
@@ -164,7 +164,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
 		{
 			name: "cr metric with custom prefix - expect error",
 			r: Resource{
-				GroupVersionKind: GroupVersionKind{
+				GroupVersionKind: schema.GroupVersionKind{
 					Group:   "apps",
 					Version: "v1",
 					Kind:    "Deployment",
@@ -208,7 +208,7 @@ func TestNewCustomResourceMetrics(t *testing.T) {
 				Families: []compiledFamily{
 					{
 						Name: "apps_deployment_test_metrics",
-						Help: "metrics for testing for apps_v1_Deployment",
+						Help: "metrics for testing for apps/v1, Kind=Deployment",
 						Each: &compiledInfo{},
 						Labels: map[string]string{
 							"customresource_group":   "apps",

pkg/customresourcestate/registry_factory_test.go

@@ -25,6 +25,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/utils/ptr"
 
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/kube-state-metrics/v2/pkg/metric"
 )
 
@@ -493,8 +494,8 @@ func r(metricNamePrefix *string) Resource {
 	return Resource{MetricNamePrefix: metricNamePrefix, GroupVersionKind: gkv("apps", "v1", "Deployment")}
 }
 
-func gkv(group, version, kind string) GroupVersionKind {
-	return GroupVersionKind{
+func gkv(group, version, kind string) schema.GroupVersionKind {
+	return schema.GroupVersionKind{
 		Group:   group,
 		Version: version,
 		Kind:    kind,