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

*: Update to sigs.k8s.io/metrics-server latest

Browse source 
Pick up changes to 1.17 to custom-metrics-apiserver and the latest
changes in metrics-server to allow us to show table results for
podmetrics and nodemetrics. Fix import and interface changes as
necessary.

The localvendor directory is an artifact of a change in sigs.k8s.io:

sigs.k8s.io/metrics-server now requires this dependency in order to
resolve, even though we do not use the scraper package.

go: sigs.k8s.io/metrics-server@v0.3.7 requires
    k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1@v0.0.0: reading k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1/pkg/kubelet/apis/stats/v1alpha1/go.mod at revision pkg/kubelet/apis/stats/v1alpha1/v0.0.0: unknown revision pkg/kubelet/apis/stats/v1alpha1/v0.0.0
This commit is contained in:
Clayton Coleman 2020-04-08 01:22:25 -04:00
parent be9797dc49
commit c6ac5cbc87
No known key found for this signature in database
GPG key ID: 3D16906B4F1C5CB3
7 changed files with 629 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cmd/adapter/adapter.go
View file

@ -27,9 +27,6 @@ import (
"os"
"time"
basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
resmetrics "github.com/kubernetes-incubator/metrics-server/pkg/apiserver/generic"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
@ -37,6 +34,10 @@ import (
"k8s.io/component-base/logs"
"k8s.io/klog"
basecmd "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/cmd"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
"sigs.k8s.io/metrics-server/pkg/api"
prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client"
mprom "github.com/directxman12/k8s-prometheus-adapter/pkg/client/metrics"
adaptercfg "github.com/directxman12/k8s-prometheus-adapter/pkg/config"
@ -213,10 +214,6 @@ func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client) erro
return fmt.Errorf("unable to construct resource metrics API provider: %v", err)
}
provCfg := &resmetrics.ProviderConfig{
Node: provider,
Pod: provider,
}
informers, err := cmd.Informers()
if err != nil {
return err
@ -227,7 +224,7 @@ func (cmd *PrometheusAdapter) addResourceMetricsAPI(promClient prom.Client) erro
return err
}
if err := resmetrics.InstallStorage(provCfg, informers.Core().V1(), server.GenericAPIServer); err != nil {
if err := api.Install(provider, informers.Core().V1(), server.GenericAPIServer); err != nil {
return err
}