From 752ce847239b82078a9cdd6d80979bee443475d3 Mon Sep 17 00:00:00 2001 From: Sergiusz Urbaniak Date: Wed, 28 Oct 2020 15:52:12 +0100 Subject: [PATCH] cmd/*,pkg/*,docs,go.mod: bump custom-metrics-apiserver, metrics-server --- cmd/adapter/adapter.go | 4 ++-- docs/config-walkthrough.md | 2 +- go.mod | 22 +++++++++---------- pkg/custom-provider/provider.go | 4 ++-- pkg/custom-provider/provider_test.go | 2 +- pkg/custom-provider/series_registry.go | 2 +- pkg/custom-provider/series_registry_test.go | 2 +- .../external_series_registry.go | 2 +- pkg/external-provider/metric_converter.go | 2 +- pkg/external-provider/provider.go | 2 +- pkg/naming/resource_converter.go | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 0675ee82c..517c17817 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -37,8 +37,8 @@ import ( "k8s.io/klog/v2" "k8s.io/sample-apiserver/pkg/apiserver" - basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + basecmd "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/cmd" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" "sigs.k8s.io/metrics-server/pkg/api" generatedopenapi "github.com/directxman12/k8s-prometheus-adapter/pkg/api/generated/openapi" diff --git a/docs/config-walkthrough.md b/docs/config-walkthrough.md index 60aa40783..83df2d65c 100644 --- a/docs/config-walkthrough.md +++ b/docs/config-walkthrough.md @@ -99,7 +99,7 @@ all resources currently available in your cluster, you can use the `kubectl api-resources` command (but the list of available resources can change as you add or remove CRDs or aggregated API servers). For more information on resources, see [Kinds, Resources, and -Scopes](https://github.com/kubernetes-incubator/custom-metrics-apiserver/blob/master/docs/getting-started.md#kinds-resources-and-scopes) +Scopes](https://github.com/kubernetes-sigs/custom-metrics-apiserver/blob/master/docs/getting-started.md#kinds-resources-and-scopes) in the custom-metrics-apiserver boilerplate guide. Now, cumulative metrics (like those that end in `_total`) aren't diff --git a/go.mod b/go.mod index 3ff13461c..75c39589c 100644 --- a/go.mod +++ b/go.mod @@ -6,24 +6,24 @@ require ( github.com/NYTimes/gziphandler v1.0.1 // indirect github.com/go-openapi/spec v0.19.8 github.com/imdario/mergo v0.3.8 // indirect - github.com/kubernetes-incubator/custom-metrics-apiserver v0.0.0-20201023074945-51cc7b53320e + github.com/kubernetes-sigs/custom-metrics-apiserver v0.0.0-20201027110359-fbe475e9e9e8 github.com/onsi/ginkgo v1.11.0 github.com/onsi/gomega v1.7.0 - github.com/prometheus/client_golang v1.0.0 + github.com/prometheus/client_golang v1.7.1 github.com/prometheus/common v0.10.0 github.com/spf13/cobra v1.0.0 - github.com/stretchr/testify v1.4.0 + github.com/stretchr/testify v1.6.1 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.18.5 - k8s.io/apimachinery v0.18.5 - k8s.io/apiserver v0.18.5 - k8s.io/client-go v0.18.5 - k8s.io/component-base v0.18.5 + k8s.io/api v0.19.3 + k8s.io/apimachinery v0.19.3 + k8s.io/apiserver v0.19.3 + k8s.io/client-go v0.19.3 + k8s.io/component-base v0.19.3 k8s.io/klog/v2 v2.3.0 - k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 - k8s.io/metrics v0.18.5 + k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 + k8s.io/metrics v0.19.3 k8s.io/sample-apiserver v0.18.5 - sigs.k8s.io/metrics-server v0.3.7-0.20200925134111-c39853110962 + sigs.k8s.io/metrics-server v0.3.7-0.20201028092756-2a1d1385123b ) // forced by the inclusion of sigs.k8s.io/metrics-server's use of this in their go.mod diff --git a/pkg/custom-provider/provider.go b/pkg/custom-provider/provider.go index 35da12cb2..1e760cd92 100644 --- a/pkg/custom-provider/provider.go +++ b/pkg/custom-provider/provider.go @@ -22,8 +22,8 @@ import ( "math" "time" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider/helpers" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider/helpers" pmodel "github.com/prometheus/common/model" apierr "k8s.io/apimachinery/pkg/api/errors" apimeta "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/custom-provider/provider_test.go b/pkg/custom-provider/provider_test.go index 94fbbf868..01d001f15 100644 --- a/pkg/custom-provider/provider_test.go +++ b/pkg/custom-provider/provider_test.go @@ -19,7 +19,7 @@ package provider import ( "time" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/custom-provider/series_registry.go b/pkg/custom-provider/series_registry.go index d87f62dcf..4ed183852 100644 --- a/pkg/custom-provider/series_registry.go +++ b/pkg/custom-provider/series_registry.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" apimeta "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/custom-provider/series_registry_test.go b/pkg/custom-provider/series_registry_test.go index c5cd3ab03..07ad17b5b 100644 --- a/pkg/custom-provider/series_registry_test.go +++ b/pkg/custom-provider/series_registry_test.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" pmodel "github.com/prometheus/common/model" diff --git a/pkg/external-provider/external_series_registry.go b/pkg/external-provider/external_series_registry.go index 75004787f..e3647a21c 100644 --- a/pkg/external-provider/external_series_registry.go +++ b/pkg/external-provider/external_series_registry.go @@ -16,7 +16,7 @@ package provider import ( "sync" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog/v2" diff --git a/pkg/external-provider/metric_converter.go b/pkg/external-provider/metric_converter.go index 927aae509..4dc0b5910 100644 --- a/pkg/external-provider/metric_converter.go +++ b/pkg/external-provider/metric_converter.go @@ -18,7 +18,7 @@ import ( "fmt" prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" "github.com/prometheus/common/model" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/external-provider/provider.go b/pkg/external-provider/provider.go index b8b8a4318..9f4ee5a50 100644 --- a/pkg/external-provider/provider.go +++ b/pkg/external-provider/provider.go @@ -23,7 +23,7 @@ import ( pmodel "github.com/prometheus/common/model" "k8s.io/klog/v2" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" apierr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/naming/resource_converter.go b/pkg/naming/resource_converter.go index d4acfef08..61ebc2950 100644 --- a/pkg/naming/resource_converter.go +++ b/pkg/naming/resource_converter.go @@ -28,7 +28,7 @@ import ( prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" "github.com/directxman12/k8s-prometheus-adapter/pkg/config" - "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" + "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" pmodel "github.com/prometheus/common/model" "k8s.io/klog/v2" )