Skip to content

Commit

Permalink
customresourcestate: Use pluralize logic from k8s/apimachinery
Browse files Browse the repository at this point in the history
  • Loading branch information
mrueg committed May 12, 2023
1 parent 5f31736 commit a9e84e8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ go 1.19
require (
github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0
github.com/fsnotify/fsnotify v1.6.0
github.com/gobuffalo/flect v1.0.2
github.com/google/go-cmp v0.5.9
github.com/oklog/run v1.1.0
github.com/prometheus/client_golang v1.15.1
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTr
github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA=
github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
Expand Down
9 changes: 5 additions & 4 deletions pkg/customresourcestate/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package customresourcestate

import (
"fmt"
"strings"

"github.com/gobuffalo/flect"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2"

"k8s.io/kube-state-metrics/v2/pkg/customresource"
Expand Down Expand Up @@ -78,8 +78,9 @@ func (r Resource) GetResourceName() string {
if r.ResourcePlural != "" {
return r.ResourcePlural
}
// kubebuilder default:
return strings.ToLower(flect.Pluralize(r.GroupVersionKind.Kind))
// kubernetes/apimachinery default:
plural, _ := meta.UnsafeGuessKindToResource(schema.GroupVersionKind(r.GroupVersionKind))
return plural.String()
}

// GroupVersionKind is the Kubernetes group, version, and kind of a resource.
Expand Down

0 comments on commit a9e84e8

Please sign in to comment.