kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-05 17:27:51 +00:00
Code Issues Projects Releases Packages Activity Actions

cmd/*,pkg/*,docs,go.mod: bump custom-metrics-apiserver, metrics-server

Browse source
This commit is contained in:
Sergiusz Urbaniak 2020-10-28 15:52:12 +01:00
parent 6b412c4a36
commit 752ce84723
11 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/adapter/adapter.go
View file

@ -37,8 +37,8 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/sample-apiserver/pkg/apiserver" "k8s.io/sample-apiserver/pkg/apiserver"
basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd" basecmd "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/cmd"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
"sigs.k8s.io/metrics-server/pkg/api" "sigs.k8s.io/metrics-server/pkg/api"
generatedopenapi "github.com/directxman12/k8s-prometheus-adapter/pkg/api/generated/openapi" generatedopenapi "github.com/directxman12/k8s-prometheus-adapter/pkg/api/generated/openapi"

2
docs/config-walkthrough.md
View file

@ -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 `kubectl api-resources` command (but the list of available resources can
change as you add or remove CRDs or aggregated API servers). For more change as you add or remove CRDs or aggregated API servers). For more
information on resources, see [Kinds, Resources, and 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. in the custom-metrics-apiserver boilerplate guide.
Now, cumulative metrics (like those that end in `_total`) aren't Now, cumulative metrics (like those that end in `_total`) aren't

22
go.mod
View file

@ -6,24 +6,24 @@ require (
github.com/NYTimes/gziphandler v1.0.1 // indirect github.com/NYTimes/gziphandler v1.0.1 // indirect
github.com/go-openapi/spec v0.19.8 github.com/go-openapi/spec v0.19.8
github.com/imdario/mergo v0.3.8 // indirect 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/ginkgo v1.11.0
github.com/onsi/gomega v1.7.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/prometheus/common v0.10.0
github.com/spf13/cobra v1.0.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 gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.18.5 k8s.io/api v0.19.3
k8s.io/apimachinery v0.18.5 k8s.io/apimachinery v0.19.3
k8s.io/apiserver v0.18.5 k8s.io/apiserver v0.19.3
k8s.io/client-go v0.18.5 k8s.io/client-go v0.19.3
k8s.io/component-base v0.18.5 k8s.io/component-base v0.19.3
k8s.io/klog/v2 v2.3.0 k8s.io/klog/v2 v2.3.0
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
k8s.io/metrics v0.18.5 k8s.io/metrics v0.19.3
k8s.io/sample-apiserver v0.18.5 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 // forced by the inclusion of sigs.k8s.io/metrics-server's use of this in their go.mod

4
pkg/custom-provider/provider.go
View file

@ -22,8 +22,8 @@ import (
"math" "math"
"time" "time"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider/helpers" "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider/helpers"
pmodel "github.com/prometheus/common/model" pmodel "github.com/prometheus/common/model"
apierr "k8s.io/apimachinery/pkg/api/errors" apierr "k8s.io/apimachinery/pkg/api/errors"
apimeta "k8s.io/apimachinery/pkg/api/meta" apimeta "k8s.io/apimachinery/pkg/api/meta"

2
pkg/custom-provider/provider_test.go
View file

@ -19,7 +19,7 @@ package provider
import ( import (
"time" "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/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/custom-provider/series_registry.go
View file

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"sync" "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" apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"

2
pkg/custom-provider/series_registry_test.go
View file

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "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/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
pmodel "github.com/prometheus/common/model" pmodel "github.com/prometheus/common/model"

2
pkg/external-provider/external_series_registry.go
View file

@ -16,7 +16,7 @@ package provider
import ( import (
"sync" "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/apimachinery/pkg/labels"
"k8s.io/klog/v2" "k8s.io/klog/v2"

2
pkg/external-provider/metric_converter.go
View file

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" 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" "github.com/prometheus/common/model"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/external-provider/provider.go
View file

@ -23,7 +23,7 @@ import (
pmodel "github.com/prometheus/common/model" pmodel "github.com/prometheus/common/model"
"k8s.io/klog/v2" "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" apierr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"

2
pkg/naming/resource_converter.go
View file

@ -28,7 +28,7 @@ import (
prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client"
"github.com/directxman12/k8s-prometheus-adapter/pkg/config" "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" pmodel "github.com/prometheus/common/model"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )