Skip to content

Commit 75bce1c

Browse files
Upgrade dependency component-base to v0.25.2 and add TODO
1 parent 37423f4 commit 75bce1c

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
k8s.io/apimachinery v0.25.2
2323
k8s.io/autoscaler/vertical-pod-autoscaler v0.12.0
2424
k8s.io/client-go v0.25.2
25+
k8s.io/component-base v0.25.2
2526
k8s.io/klog/v2 v2.80.1
2627
k8s.io/sample-controller v0.25.2
2728
k8s.io/utils v0.0.0-20220922133306-665eaaec4324
@@ -40,7 +41,7 @@ require (
4041
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
4142
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
4243
github.com/beorn7/perks v1.0.1 // indirect
43-
github.com/blang/semver v3.5.0+incompatible // indirect
44+
github.com/blang/semver/v4 v4.0.0 // indirect
4445
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4546
github.com/davecgh/go-spew v1.1.1 // indirect
4647
github.com/emicklei/go-restful/v3 v3.8.0 // indirect

go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
9393
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
9494
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
9595
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
96+
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
9697
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
9798
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
9899
github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
@@ -984,6 +985,8 @@ k8s.io/client-go v0.25.2/go.mod h1:i7cNU7N+yGQmJkewcRD2+Vuj4iz7b30kI8OcL3horQ4=
984985
k8s.io/code-generator v0.25.0/go.mod h1:B6jZgI3DvDFAualltPitbYMQ74NjaCFxum3YeKZZ+3w=
985986
k8s.io/code-generator v0.25.2/go.mod h1:f61OcU2VqVQcjt/6TrU0sta1TA5hHkOO6ZZPwkL9Eys=
986987
k8s.io/component-base v0.25.0/go.mod h1:F2Sumv9CnbBlqrpdf7rKZTmmd2meJq0HizeyY/yAFxk=
988+
k8s.io/component-base v0.25.2 h1:Nve/ZyHLUBHz1rqwkjXm/Re6IniNa5k7KgzxZpTfSQY=
989+
k8s.io/component-base v0.25.2/go.mod h1:90W21YMr+Yjg7MX+DohmZLzjsBtaxQDDwaX4YxDkl60=
987990
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
988991
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
989992
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

internal/store/node.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"context"
2121
"strings"
2222

23+
basemetrics "k8s.io/component-base/metrics"
2324
"k8s.io/kube-state-metrics/v2/pkg/constant"
2425
"k8s.io/kube-state-metrics/v2/pkg/metric"
2526
generator "k8s.io/kube-state-metrics/v2/pkg/metric_generator"
26-
basemetrics "k8s.io/component-base/metrics"
2727

2828
v1 "k8s.io/api/core/v1"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/metric_generator/generator.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"strings"
2222

23-
"k8s.io/kube-state-metrics/v2/pkg/metric"
2423
basemetrics "k8s.io/component-base/metrics"
24+
"k8s.io/kube-state-metrics/v2/pkg/metric"
2525
)
2626

2727
// FamilyGenerator provides everything needed to generate a metric family with a
@@ -38,7 +38,7 @@ type FamilyGenerator struct {
3838
GenerateFunc func(obj interface{}) *metric.Family
3939
}
4040

41-
// NewFamilyGenerator creates new FamilyGenerator instances with metric
41+
// NewFamilyGeneratorWithStability creates new FamilyGenerator instances with metric
4242
// stabilityLevel.
4343
func NewFamilyGeneratorWithStability(name string, help string, metricType metric.Type, stabilityLevel basemetrics.StabilityLevel, deprecatedVersion string, generateFunc func(obj interface{}) *metric.Family) *FamilyGenerator {
4444
f := &FamilyGenerator{
@@ -84,10 +84,10 @@ func (g *FamilyGenerator) generateHeader() string {
8484
header.WriteString("# HELP ")
8585
header.WriteString(g.Name)
8686
header.WriteByte(' ')
87-
// Will remove if-else after all metrics are attached with right
87+
// TODO(#1833): remove if-else after all metrics are attached with right
8888
// StabilityLevel.
8989
if g.StabilityLevel == basemetrics.STABLE {
90-
header.WriteString(fmt.Sprintf("[%v] %v", g.StabilityLevel, g.Help))
90+
header.WriteString(fmt.Sprintf("[%v] %v", g.StabilityLevel, g.Help))
9191
} else {
9292
header.WriteString(g.Help)
9393
}

0 commit comments

Comments
 (0)