diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 3a8e6cb1..dd801222 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -21,13 +21,14 @@ import ( "crypto/x509" "flag" "fmt" - "github.com/prometheus/client_golang/prometheus/promhttp" "io/ioutil" "net/http" "net/url" "os" "time" + "github.com/prometheus/client_golang/prometheus/promhttp" + 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" diff --git a/pkg/config/loader.go b/pkg/config/loader.go index 6b515c35..b0ec0c4c 100644 --- a/pkg/config/loader.go +++ b/pkg/config/loader.go @@ -2,10 +2,11 @@ package config import ( "fmt" - "github.com/directxman12/k8s-prometheus-adapter/pkg/metrics" "io/ioutil" "os" + "github.com/directxman12/k8s-prometheus-adapter/pkg/metrics" + "gopkg.in/yaml.v2" ) diff --git a/pkg/custom-provider/provider.go b/pkg/custom-provider/provider.go index 15e5b945..1d78bd1d 100644 --- a/pkg/custom-provider/provider.go +++ b/pkg/custom-provider/provider.go @@ -19,9 +19,10 @@ package provider import ( "context" "fmt" + "time" + "github.com/directxman12/k8s-prometheus-adapter/pkg/errors" "github.com/directxman12/k8s-prometheus-adapter/pkg/metrics" - "time" "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider/helpers" diff --git a/pkg/custom-provider/series_registry.go b/pkg/custom-provider/series_registry.go index 09c7eeff..345f91f7 100644 --- a/pkg/custom-provider/series_registry.go +++ b/pkg/custom-provider/series_registry.go @@ -18,9 +18,10 @@ package provider import ( "fmt" - "github.com/directxman12/k8s-prometheus-adapter/pkg/metrics" "sync" + "github.com/directxman12/k8s-prometheus-adapter/pkg/metrics" + "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" apimeta "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/external-provider/external_series_registry.go b/pkg/external-provider/external_series_registry.go index cfb58e97..998fd54c 100644 --- a/pkg/external-provider/external_series_registry.go +++ b/pkg/external-provider/external_series_registry.go @@ -14,9 +14,10 @@ limitations under the License. package provider import ( - "github.com/directxman12/k8s-prometheus-adapter/pkg/metrics" "sync" + "github.com/directxman12/k8s-prometheus-adapter/pkg/metrics" + "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" diff --git a/pkg/external-provider/provider.go b/pkg/external-provider/provider.go index c587dbc9..bba72d19 100644 --- a/pkg/external-provider/provider.go +++ b/pkg/external-provider/provider.go @@ -16,9 +16,10 @@ package provider import ( "context" "fmt" - "github.com/directxman12/k8s-prometheus-adapter/pkg/errors" "time" + "github.com/directxman12/k8s-prometheus-adapter/pkg/errors" + "k8s.io/apimachinery/pkg/runtime/schema" pmodel "github.com/prometheus/common/model"