go.mod: Bump k8s deps to v0.24.0

This ends up bumping the prometheus client as well.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
This commit is contained in:
Daniel Canter
2022-05-06 13:20:09 -07:00
parent 459179360a
commit d1c49781ed
281 changed files with 22374 additions and 16508 deletions

16
vendor/k8s.io/component-base/featuregate/OWNERS generated vendored Normal file
View File

@@ -0,0 +1,16 @@
# See the OWNERS docs at https://go.k8s.io/owners
# Currently assigned to api-approvers since feature gates are the API
# for enabling/disabling other APIs.
# Disable inheritance as this is an api owners file
options:
no_parent_owners: true
approvers:
- api-approvers
reviewers:
- api-reviewers
labels:
- kind/api-change
- sig/api-machinery
- sig/cluster-lifecycle

View File

@@ -1,11 +1,11 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers:
- sig-instrumentation-approvers
- logicalhan
- RainbowMango
- sig-instrumentation-approvers
- logicalhan
- RainbowMango
reviewers:
- sig-instrumentation-reviewers
- YoyinZyc
- sig-instrumentation-reviewers
- YoyinZyc
labels:
- sig/instrumentation
- sig/instrumentation

View File

@@ -19,7 +19,7 @@ package metrics
import (
"fmt"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
)

View File

@@ -18,7 +18,7 @@ package metrics
import (
"context"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go"
)
@@ -212,13 +212,13 @@ func (v *CounterVec) Reset() {
func (v *CounterVec) WithContext(ctx context.Context) *CounterVecWithContext {
return &CounterVecWithContext{
ctx: ctx,
CounterVec: *v,
CounterVec: v,
}
}
// CounterVecWithContext is the wrapper of CounterVec with context.
type CounterVecWithContext struct {
CounterVec
*CounterVec
ctx context.Context
}

View File

@@ -20,7 +20,7 @@ import (
"fmt"
"sync"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/klog/v2"

View File

@@ -18,7 +18,7 @@ package metrics
import (
"context"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
"k8s.io/component-base/version"
@@ -189,8 +189,8 @@ func (v *GaugeVec) Reset() {
v.GaugeVec.Reset()
}
func newGaugeFunc(opts GaugeOpts, function func() float64, v semver.Version) GaugeFunc {
g := NewGauge(&opts)
func newGaugeFunc(opts *GaugeOpts, function func() float64, v semver.Version) GaugeFunc {
g := NewGauge(opts)
if !g.Create(&v) {
return nil
@@ -205,7 +205,7 @@ func newGaugeFunc(opts GaugeOpts, function func() float64, v semver.Version) Gau
// concurrently. If that results in concurrent calls to Write, like in the case
// where a GaugeFunc is directly registered with Prometheus, the provided
// function must be concurrency-safe.
func NewGaugeFunc(opts GaugeOpts, function func() float64) GaugeFunc {
func NewGaugeFunc(opts *GaugeOpts, function func() float64) GaugeFunc {
v := parseVersion(version.Get())
return newGaugeFunc(opts, function, v)
@@ -215,13 +215,13 @@ func NewGaugeFunc(opts GaugeOpts, function func() float64) GaugeFunc {
func (v *GaugeVec) WithContext(ctx context.Context) *GaugeVecWithContext {
return &GaugeVecWithContext{
ctx: ctx,
GaugeVec: *v,
GaugeVec: v,
}
}
// GaugeVecWithContext is the wrapper of GaugeVec with context.
type GaugeVecWithContext struct {
GaugeVec
*GaugeVec
ctx context.Context
}

View File

@@ -18,7 +18,7 @@ package metrics
import (
"context"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
)
@@ -199,13 +199,13 @@ func (v *HistogramVec) Reset() {
func (v *HistogramVec) WithContext(ctx context.Context) *HistogramVecWithContext {
return &HistogramVecWithContext{
ctx: ctx,
HistogramVec: *v,
HistogramVec: v,
}
}
// HistogramVecWithContext is the wrapper of HistogramVec with context.
type HistogramVecWithContext struct {
HistogramVec
*HistogramVec
ctx context.Context
}

View File

@@ -44,18 +44,15 @@ var (
)
func init() {
//lint:ignore SA1019 - replacement function still calls prometheus.NewProcessCollector().
//nolint:staticcheck // SA1019 - replacement function still calls prometheus.NewProcessCollector().
RawMustRegister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}))
//lint:ignore SA1019 - replacement function still calls prometheus.NewGoCollector().
//nolint:staticcheck // SA1019 - replacement function still calls prometheus.NewGoCollector().
RawMustRegister(prometheus.NewGoCollector())
}
// Handler returns an HTTP handler for the DefaultGatherer. It is
// already instrumented with InstrumentHandler (using "prometheus" as handler
// name).
//
// Deprecated: Please note the issues described in the doc comment of
// InstrumentHandler. You might want to consider using promhttp.Handler instead.
func Handler() http.Handler {
return promhttp.InstrumentMetricHandler(prometheus.DefaultRegisterer, promhttp.HandlerFor(defaultRegistry, promhttp.HandlerOpts{}))
}

View File

@@ -19,7 +19,7 @@ package metrics
import (
"sync"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go"
@@ -169,8 +169,8 @@ func (r *lazyMetric) ClearState() {
r.isDeprecated = false
r.isHidden = false
r.isCreated = false
r.markDeprecationOnce = *(new(sync.Once))
r.createOnce = *(new(sync.Once))
r.markDeprecationOnce = sync.Once{}
r.createOnce = sync.Once{}
}
// FQName returns the fully-qualified metric name of the collector.

View File

@@ -20,7 +20,7 @@ import (
"fmt"
"regexp"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/spf13/pflag"
"k8s.io/component-base/version"

View File

@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
/*

View File

@@ -1,3 +1,4 @@
//go:build windows
// +build windows
/*

View File

@@ -21,7 +21,7 @@ import (
"sync"
"sync/atomic"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
dto "github.com/prometheus/client_model/go"
@@ -274,7 +274,7 @@ func (kr *kubeRegistry) enableHiddenCollectors() {
cs = append(cs, c)
}
kr.hiddenCollectors = nil
kr.hiddenCollectors = make(map[string]Registerable)
kr.hiddenCollectorsLock.Unlock()
kr.MustRegister(cs...)
}

View File

@@ -18,7 +18,7 @@ package metrics
import (
"context"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/prometheus/client_golang/prometheus"
)
@@ -193,13 +193,13 @@ func (v *SummaryVec) Reset() {
func (v *SummaryVec) WithContext(ctx context.Context) *SummaryVecWithContext {
return &SummaryVecWithContext{
ctx: ctx,
SummaryVec: *v,
SummaryVec: v,
}
}
// SummaryVecWithContext is the wrapper of SummaryVec with context.
type SummaryVecWithContext struct {
SummaryVec
*SummaryVec
ctx context.Context
}

View File

@@ -20,7 +20,7 @@ import (
"fmt"
"regexp"
"github.com/blang/semver"
"github.com/blang/semver/v4"
apimachineryversion "k8s.io/apimachinery/pkg/version"
)

View File

@@ -1 +0,0 @@
base.go export-subst

16
vendor/k8s.io/component-base/version/OWNERS generated vendored Normal file
View File

@@ -0,0 +1,16 @@
# See the OWNERS docs at https://go.k8s.io/owners
# Currently assigned this directory to sig-api-machinery since this is
# an interface to the version definition in "k8s.io/apimachinery/pkg/version",
# and also to sig-release since this version information is set up for
# each release.
approvers:
- sig-api-machinery-api-approvers
- release-engineering-approvers
reviewers:
- sig-api-machinery-api-reviewers
- release-managers
labels:
- sig/api-machinery
- sig/release