Merge pull request kubernetes#1 from branden/upbound-fix-metricname-a…

…pigroup Allow custom resources with the same kind to be watched
branden · Mar 3, 2023 · bc0b977 · bc0b977
2 parents 054f2a4 + 7af9116
commit bc0b977
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 FLAGS =
 TESTENVVAR =
-REGISTRY ?= gcr.io/k8s-staging-kube-state-metrics
+REGISTRY ?= us-west1-docker.pkg.dev/orchestration-build/kube-state-metrics
 TAG_PREFIX = v
 VERSION = $(shell cat VERSION)
 TAG ?= $(TAG_PREFIX)$(VERSION)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.8.1
+2.8.1-upbound001
diff --git a/pkg/customresourcestate/custom_resource_metrics.go b/pkg/customresourcestate/custom_resource_metrics.go
@@ -60,7 +60,7 @@ func NewCustomResourceMetrics(resource Resource) (customresource.RegistryFactory
 }
 
 func (s customResourceMetrics) Name() string {
-	return s.ResourceName
+	return s.ResourceName + "." + s.GroupVersionKind.Group
 }
 
 func (s customResourceMetrics) CreateClient(cfg *rest.Config) (interface{}, error) {