From cd55a67b899bf1a8ca4bbe2aa4d42970db74e13e Mon Sep 17 00:00:00 2001 From: paulfantom Date: Mon, 22 Feb 2021 15:26:02 +0100 Subject: [PATCH] *: move all imports to github.com/kubernetes-sigs/prometheus-adapter Signed-off-by: paulfantom --- .travis.yml | 2 +- Makefile | 6 +++--- cmd/adapter/adapter.go | 16 ++++++++-------- cmd/config-gen/main.go | 2 +- cmd/config-gen/utils/default.go | 4 ++-- go.mod | 2 +- pkg/client/fake/client.go | 2 +- pkg/client/metrics/metrics.go | 2 +- pkg/custom-provider/provider.go | 4 ++-- pkg/custom-provider/provider_test.go | 8 ++++---- pkg/custom-provider/series_registry.go | 4 ++-- pkg/custom-provider/series_registry_test.go | 6 +++--- pkg/external-provider/basic_metric_lister.go | 4 ++-- .../external_series_registry.go | 4 ++-- pkg/external-provider/metric_converter.go | 2 +- .../periodic_metric_lister_test.go | 2 +- pkg/external-provider/provider.go | 4 ++-- pkg/naming/metric_namer.go | 4 ++-- pkg/naming/metrics_query.go | 2 +- pkg/naming/metrics_query_test.go | 2 +- pkg/naming/regex_matcher_test.go | 2 +- pkg/naming/resource_converter.go | 4 ++-- pkg/resourceprovider/provider.go | 6 +++--- pkg/resourceprovider/provider_test.go | 6 +++--- 24 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index 395bb424..499fef6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go: - '1.15' # blech, Travis downloads with capitals in DirectXMan12, which confuses go -go_import_path: github.com/directxman12/k8s-prometheus-adapter +go_import_path: github.com/kubernetes-sigs/prometheus-adapter script: make verify && git diff --exit-code diff --git a/Makefile b/Makefile index c9c2202d..a9a4b984 100644 --- a/Makefile +++ b/Makefile @@ -34,11 +34,11 @@ all: $(OUT_DIR)/$(ARCH)/adapter src_deps=$(shell find pkg cmd -type f -name "*.go") $(OUT_DIR)/%/adapter: $(src_deps) - CGO_ENABLED=0 GOARCH=$* go build -tags netgo -o $(OUT_DIR)/$*/adapter github.com/directxman12/k8s-prometheus-adapter/cmd/adapter + CGO_ENABLED=0 GOARCH=$* go build -tags netgo -o $(OUT_DIR)/$*/adapter github.com/kubernetes-sigs/prometheus-adapter/cmd/adapter docker-build: $(OUT_DIR)/Dockerfile - docker run -it -v $(OUT_DIR):/build -v $(PWD):/go/src/github.com/directxman12/k8s-prometheus-adapter -e GOARCH=$(ARCH) $(GOIMAGE) /bin/bash -c "\ - CGO_ENABLED=0 go build -tags netgo -o /build/$(ARCH)/adapter github.com/directxman12/k8s-prometheus-adapter/cmd/adapter" + docker run -it -v $(OUT_DIR):/build -v $(PWD):/go/src/github.com/kubernetes-sigs/prometheus-adapter -e GOARCH=$(ARCH) $(GOIMAGE) /bin/bash -c "\ + CGO_ENABLED=0 go build -tags netgo -o /build/$(ARCH)/adapter github.com/kubernetes-sigs/prometheus-adapter/cmd/adapter" docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(VERSION) --build-arg ARCH=$(ARCH) --build-arg BASEIMAGE=$(BASEIMAGE) $(OUT_DIR) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 517c1781..48c85be1 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -41,14 +41,14 @@ import ( "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" - 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" - cmprov "github.com/directxman12/k8s-prometheus-adapter/pkg/custom-provider" - extprov "github.com/directxman12/k8s-prometheus-adapter/pkg/external-provider" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" - resprov "github.com/directxman12/k8s-prometheus-adapter/pkg/resourceprovider" + generatedopenapi "github.com/kubernetes-sigs/prometheus-adapter/pkg/api/generated/openapi" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + mprom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client/metrics" + adaptercfg "github.com/kubernetes-sigs/prometheus-adapter/pkg/config" + cmprov "github.com/kubernetes-sigs/prometheus-adapter/pkg/custom-provider" + extprov "github.com/kubernetes-sigs/prometheus-adapter/pkg/external-provider" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" + resprov "github.com/kubernetes-sigs/prometheus-adapter/pkg/resourceprovider" ) type PrometheusAdapter struct { diff --git a/cmd/config-gen/main.go b/cmd/config-gen/main.go index b3d8f7e1..9aad7058 100644 --- a/cmd/config-gen/main.go +++ b/cmd/config-gen/main.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" - "github.com/directxman12/k8s-prometheus-adapter/cmd/config-gen/utils" + "github.com/kubernetes-sigs/prometheus-adapter/cmd/config-gen/utils" ) func main() { diff --git a/cmd/config-gen/utils/default.go b/cmd/config-gen/utils/default.go index 54262f8b..13d779a9 100644 --- a/cmd/config-gen/utils/default.go +++ b/cmd/config-gen/utils/default.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - . "github.com/directxman12/k8s-prometheus-adapter/pkg/config" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + . "github.com/kubernetes-sigs/prometheus-adapter/pkg/config" pmodel "github.com/prometheus/common/model" ) diff --git a/go.mod b/go.mod index 616d7ff9..eb51f71d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/directxman12/k8s-prometheus-adapter +module github.com/kubernetes-sigs/prometheus-adapter go 1.13 diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go index 9714975f..0837cafb 100644 --- a/pkg/client/fake/client.go +++ b/pkg/client/fake/client.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" pmodel "github.com/prometheus/common/model" ) diff --git a/pkg/client/metrics/metrics.go b/pkg/client/metrics/metrics.go index 5da23234..d8e82917 100644 --- a/pkg/client/metrics/metrics.go +++ b/pkg/client/metrics/metrics.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/directxman12/k8s-prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" ) var ( diff --git a/pkg/custom-provider/provider.go b/pkg/custom-provider/provider.go index f06f4d40..bdfbed41 100644 --- a/pkg/custom-provider/provider.go +++ b/pkg/custom-provider/provider.go @@ -37,8 +37,8 @@ import ( "k8s.io/klog/v2" "k8s.io/metrics/pkg/apis/custom_metrics" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" ) // Runnable represents something that can be run until told to stop. diff --git a/pkg/custom-provider/provider_test.go b/pkg/custom-provider/provider_test.go index 01d001f1..13a7e5ab 100644 --- a/pkg/custom-provider/provider_test.go +++ b/pkg/custom-provider/provider_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" fakedyn "k8s.io/client-go/dynamic/fake" - config "github.com/directxman12/k8s-prometheus-adapter/cmd/config-gen/utils" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - fakeprom "github.com/directxman12/k8s-prometheus-adapter/pkg/client/fake" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + config "github.com/kubernetes-sigs/prometheus-adapter/cmd/config-gen/utils" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + fakeprom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client/fake" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" pmodel "github.com/prometheus/common/model" ) diff --git a/pkg/custom-provider/series_registry.go b/pkg/custom-provider/series_registry.go index 4ed18385..5e17f855 100644 --- a/pkg/custom-provider/series_registry.go +++ b/pkg/custom-provider/series_registry.go @@ -24,8 +24,8 @@ import ( apimeta "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/labels" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" pmodel "github.com/prometheus/common/model" "k8s.io/klog/v2" ) diff --git a/pkg/custom-provider/series_registry_test.go b/pkg/custom-provider/series_registry_test.go index 07ad17b5..6e55f8b9 100644 --- a/pkg/custom-provider/series_registry_test.go +++ b/pkg/custom-provider/series_registry_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/selection" - config "github.com/directxman12/k8s-prometheus-adapter/cmd/config-gen/utils" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + config "github.com/kubernetes-sigs/prometheus-adapter/cmd/config-gen/utils" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" ) // restMapper creates a RESTMapper with just the types we need for diff --git a/pkg/external-provider/basic_metric_lister.go b/pkg/external-provider/basic_metric_lister.go index 82cb8857..f749e204 100644 --- a/pkg/external-provider/basic_metric_lister.go +++ b/pkg/external-provider/basic_metric_lister.go @@ -24,8 +24,8 @@ import ( pmodel "github.com/prometheus/common/model" "k8s.io/klog/v2" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" ) // Runnable represents something that can be run until told to stop. diff --git a/pkg/external-provider/external_series_registry.go b/pkg/external-provider/external_series_registry.go index e3647a21..c17b2fea 100644 --- a/pkg/external-provider/external_series_registry.go +++ b/pkg/external-provider/external_series_registry.go @@ -20,8 +20,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog/v2" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" ) // ExternalSeriesRegistry acts as the top-level converter for transforming Kubernetes requests diff --git a/pkg/external-provider/metric_converter.go b/pkg/external-provider/metric_converter.go index 4dc0b591..14043b13 100644 --- a/pkg/external-provider/metric_converter.go +++ b/pkg/external-provider/metric_converter.go @@ -17,8 +17,8 @@ import ( "errors" "fmt" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" "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/periodic_metric_lister_test.go b/pkg/external-provider/periodic_metric_lister_test.go index 866a6132..b6ad6ded 100644 --- a/pkg/external-provider/periodic_metric_lister_test.go +++ b/pkg/external-provider/periodic_metric_lister_test.go @@ -17,7 +17,7 @@ import ( "testing" "time" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" "github.com/stretchr/testify/require" ) diff --git a/pkg/external-provider/provider.go b/pkg/external-provider/provider.go index 9f4ee5a5..6fd2770d 100644 --- a/pkg/external-provider/provider.go +++ b/pkg/external-provider/provider.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/metrics/pkg/apis/external_metrics" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" ) type externalPrometheusProvider struct { diff --git a/pkg/naming/metric_namer.go b/pkg/naming/metric_namer.go index 5b208928..54ac7183 100644 --- a/pkg/naming/metric_namer.go +++ b/pkg/naming/metric_namer.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/config" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/config" ) // MetricNamer knows how to convert Prometheus series names and label names to diff --git a/pkg/naming/metrics_query.go b/pkg/naming/metrics_query.go index 34e39da7..2f289262 100644 --- a/pkg/naming/metrics_query.go +++ b/pkg/naming/metrics_query.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/selection" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" ) // MetricsQuery represents a compiled metrics query for some set of diff --git a/pkg/naming/metrics_query_test.go b/pkg/naming/metrics_query_test.go index 1bc95656..9661d15d 100644 --- a/pkg/naming/metrics_query_test.go +++ b/pkg/naming/metrics_query_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" pmodel "github.com/prometheus/common/model" labels "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/naming/regex_matcher_test.go b/pkg/naming/regex_matcher_test.go index 558a5713..0dace4cd 100644 --- a/pkg/naming/regex_matcher_test.go +++ b/pkg/naming/regex_matcher_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/directxman12/k8s-prometheus-adapter/pkg/config" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/config" ) func TestReMatcherIs(t *testing.T) { diff --git a/pkg/naming/resource_converter.go b/pkg/naming/resource_converter.go index 61ebc295..d259f40e 100644 --- a/pkg/naming/resource_converter.go +++ b/pkg/naming/resource_converter.go @@ -26,9 +26,9 @@ import ( apimeta "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/config" "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/config" pmodel "github.com/prometheus/common/model" "k8s.io/klog/v2" ) diff --git a/pkg/resourceprovider/provider.go b/pkg/resourceprovider/provider.go index 0d477ddf..371eee0b 100644 --- a/pkg/resourceprovider/provider.go +++ b/pkg/resourceprovider/provider.go @@ -32,9 +32,9 @@ import ( metrics "k8s.io/metrics/pkg/apis/metrics" "sigs.k8s.io/metrics-server/pkg/api" - "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - "github.com/directxman12/k8s-prometheus-adapter/pkg/config" - "github.com/directxman12/k8s-prometheus-adapter/pkg/naming" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/config" + "github.com/kubernetes-sigs/prometheus-adapter/pkg/naming" pmodel "github.com/prometheus/common/model" ) diff --git a/pkg/resourceprovider/provider_test.go b/pkg/resourceprovider/provider_test.go index 8d212d86..919c0d58 100644 --- a/pkg/resourceprovider/provider_test.go +++ b/pkg/resourceprovider/provider_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/metrics/pkg/apis/metrics" "sigs.k8s.io/metrics-server/pkg/api" - config "github.com/directxman12/k8s-prometheus-adapter/cmd/config-gen/utils" - prom "github.com/directxman12/k8s-prometheus-adapter/pkg/client" - fakeprom "github.com/directxman12/k8s-prometheus-adapter/pkg/client/fake" + config "github.com/kubernetes-sigs/prometheus-adapter/cmd/config-gen/utils" + prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client" + fakeprom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client/fake" pmodel "github.com/prometheus/common/model" )