diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index be80e803..0675ee82 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/transport" "k8s.io/component-base/logs" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/sample-apiserver/pkg/apiserver" basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd" diff --git a/go.mod b/go.mod index b3ed02fc..3ff13461 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( k8s.io/apiserver v0.18.5 k8s.io/client-go v0.18.5 k8s.io/component-base v0.18.5 - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.3.0 k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 k8s.io/metrics v0.18.5 k8s.io/sample-apiserver v0.18.5 diff --git a/pkg/client/api.go b/pkg/client/api.go index 10fd8607..84cf7d17 100644 --- a/pkg/client/api.go +++ b/pkg/client/api.go @@ -28,7 +28,7 @@ import ( "time" "github.com/prometheus/common/model" - "k8s.io/klog" + "k8s.io/klog/v2" ) // APIClient is a raw client to the Prometheus Query API. diff --git a/pkg/custom-provider/provider.go b/pkg/custom-provider/provider.go index 814d5650..35da12cb 100644 --- a/pkg/custom-provider/provider.go +++ b/pkg/custom-provider/provider.go @@ -34,7 +34,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/metrics/pkg/apis/custom_metrics" prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" diff --git a/pkg/custom-provider/series_registry.go b/pkg/custom-provider/series_registry.go index 911b6538..d87f62dc 100644 --- a/pkg/custom-provider/series_registry.go +++ b/pkg/custom-provider/series_registry.go @@ -27,7 +27,7 @@ import ( prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" pmodel "github.com/prometheus/common/model" - "k8s.io/klog" + "k8s.io/klog/v2" ) // NB: container metrics sourced from cAdvisor don't consistently follow naming conventions, diff --git a/pkg/external-provider/basic_metric_lister.go b/pkg/external-provider/basic_metric_lister.go index 987041fc..82cb8857 100644 --- a/pkg/external-provider/basic_metric_lister.go +++ b/pkg/external-provider/basic_metric_lister.go @@ -22,7 +22,7 @@ import ( "time" pmodel "github.com/prometheus/common/model" - "k8s.io/klog" + "k8s.io/klog/v2" prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" diff --git a/pkg/external-provider/external_series_registry.go b/pkg/external-provider/external_series_registry.go index 98fe23a0..75004787 100644 --- a/pkg/external-provider/external_series_registry.go +++ b/pkg/external-provider/external_series_registry.go @@ -18,7 +18,7 @@ import ( "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" "k8s.io/apimachinery/pkg/labels" - "k8s.io/klog" + "k8s.io/klog/v2" prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" diff --git a/pkg/external-provider/provider.go b/pkg/external-provider/provider.go index 44d004c6..b8b8a431 100644 --- a/pkg/external-provider/provider.go +++ b/pkg/external-provider/provider.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" pmodel "github.com/prometheus/common/model" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" diff --git a/pkg/naming/resource_converter.go b/pkg/naming/resource_converter.go index c1e61b81..d4acfef0 100644 --- a/pkg/naming/resource_converter.go +++ b/pkg/naming/resource_converter.go @@ -30,7 +30,7 @@ import ( "github.com/directxman12/k8s-prometheus-adapter/pkg/config" "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" pmodel "github.com/prometheus/common/model" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/pkg/resourceprovider/provider.go b/pkg/resourceprovider/provider.go index da0bc70b..37add1a3 100644 --- a/pkg/resourceprovider/provider.go +++ b/pkg/resourceprovider/provider.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" apitypes "k8s.io/apimachinery/pkg/types" - "k8s.io/klog" + "k8s.io/klog/v2" metrics "k8s.io/metrics/pkg/apis/metrics" "sigs.k8s.io/metrics-server/pkg/api"