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

Merge pull request #404 from dgrisonnet/module

Browse source 
Move prometheus-adapter to sigs.k8s.io golang package
This commit is contained in:
Kubernetes Prow Robot 2021-06-02 02:30:06 -07:00 • committed by GitHub
commit 815fa20931
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 81 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -32,11 +32,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/kubernetes-sigs/prometheus-adapter/cmd/adapter
CGO_ENABLED=0 GOARCH=$* go build -tags netgo -o $(OUT_DIR)/$*/adapter sigs.k8s.io/prometheus-adapter/cmd/adapter
docker-build: $(OUT_DIR)/Dockerfile
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 run -it -v $(OUT_DIR):/build -v $(PWD):/go/src/sigs.k8s.io/prometheus-adapter -e GOARCH=$(ARCH) $(GOIMAGE) /bin/bash -c "\
CGO_ENABLED=0 go build -tags netgo -o /build/$(ARCH)/adapter sigs.k8s.io/prometheus-adapter/cmd/adapter"
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(VERSION) --build-arg ARCH=$(ARCH) --build-arg BASEIMAGE=$(BASEIMAGE) $(OUT_DIR)

21
cmd/adapter/adapter.go
View file

@ -27,6 +27,9 @@ import (
"os"
"time"
basecmd "github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/cmd"
"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
genericapiserver "k8s.io/apiserver/pkg/server"
"k8s.io/client-go/rest"
@ -36,18 +39,16 @@ import (
"k8s.io/klog/v2"
"k8s.io/sample-apiserver/pkg/apiserver"
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/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"
generatedopenapi "sigs.k8s.io/prometheus-adapter/pkg/api/generated/openapi"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
mprom "sigs.k8s.io/prometheus-adapter/pkg/client/metrics"
adaptercfg "sigs.k8s.io/prometheus-adapter/pkg/config"
cmprov "sigs.k8s.io/prometheus-adapter/pkg/custom-provider"
extprov "sigs.k8s.io/prometheus-adapter/pkg/external-provider"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
resprov "sigs.k8s.io/prometheus-adapter/pkg/resourceprovider"
)
type PrometheusAdapter struct {

2
cmd/config-gen/main.go
View file

@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
yaml "gopkg.in/yaml.v2"
"github.com/kubernetes-sigs/prometheus-adapter/cmd/config-gen/utils"
"sigs.k8s.io/prometheus-adapter/cmd/config-gen/utils"
)
func main() {

5
cmd/config-gen/utils/default.go
View file

@ -4,9 +4,10 @@ import (
"fmt"
"time"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
. "github.com/kubernetes-sigs/prometheus-adapter/pkg/config"
pmodel "github.com/prometheus/common/model"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
. "sigs.k8s.io/prometheus-adapter/pkg/config"
)
// DefaultConfig returns a configuration equivalent to the former

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/kubernetes-sigs/prometheus-adapter
module sigs.k8s.io/prometheus-adapter
go 1.16

3
pkg/client/fake/client.go
View file

@ -20,8 +20,9 @@ import (
"context"
"fmt"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
pmodel "github.com/prometheus/common/model"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
)
// FakePrometheusClient is a fake instance of prom.Client

2
pkg/client/metrics/metrics.go
View file

@ -22,7 +22,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/client"
)
var (

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

@ -25,6 +25,7 @@ import (
"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"
"k8s.io/apimachinery/pkg/api/resource"
@ -37,8 +38,8 @@ import (
"k8s.io/klog/v2"
"k8s.io/metrics/pkg/apis/custom_metrics"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/naming"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
)
// Runnable represents something that can be run until told to stop.

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

@ -19,16 +19,17 @@ package provider
import (
"time"
"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/runtime/schema"
fakedyn "k8s.io/client-go/dynamic/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"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/naming"
config "sigs.k8s.io/prometheus-adapter/cmd/config-gen/utils"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
fakeprom "sigs.k8s.io/prometheus-adapter/pkg/client/fake"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pmodel "github.com/prometheus/common/model"
)

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

@ -20,14 +20,15 @@ import (
"fmt"
"sync"
"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/labels"
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"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
pmodel "github.com/prometheus/common/model"
)
// NB: container metrics sourced from cAdvisor don't consistently follow naming conventions,

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

@ -31,9 +31,9 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/selection"
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"
config "sigs.k8s.io/prometheus-adapter/cmd/config-gen/utils"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
)
// restMapper creates a RESTMapper with just the types we need for

7
pkg/external-provider/basic_metric_lister.go
View file

@ -21,11 +21,12 @@ import (
"fmt"
"time"
pmodel "github.com/prometheus/common/model"
"k8s.io/klog/v2"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/naming"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
pmodel "github.com/prometheus/common/model"
)
// Runnable represents something that can be run until told to stop.

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

@ -20,8 +20,8 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog/v2"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/naming"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
)
// ExternalSeriesRegistry acts as the top-level converter for transforming Kubernetes requests

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

@ -17,12 +17,14 @@ import (
"errors"
"fmt"
"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"
"k8s.io/metrics/pkg/apis/external_metrics"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"github.com/kubernetes-sigs/custom-metrics-apiserver/pkg/provider"
"github.com/prometheus/common/model"
)
// MetricConverter provides a unified interface for converting the results of

3
pkg/external-provider/periodic_metric_lister_test.go
View file

@ -17,7 +17,8 @@ import (
"testing"
"time"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"github.com/stretchr/testify/require"
)

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

@ -29,8 +29,8 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/metrics/pkg/apis/external_metrics"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/naming"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
)
type externalPrometheusProvider struct {

4
pkg/naming/metric_namer.go
View file

@ -24,8 +24,8 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/config"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/config"
)
// MetricNamer knows how to convert Prometheus series names and label names to

2
pkg/naming/metrics_query.go
View file

@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/selection"
prom "github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
)
// MetricsQuery represents a compiled metrics query for some set of

6
pkg/naming/metrics_query_test.go
View file

@ -20,11 +20,13 @@ import (
"fmt"
"testing"
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"
"k8s.io/apimachinery/pkg/selection"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
pmodel "github.com/prometheus/common/model"
)
type resourceConverterMock struct {

2
pkg/naming/regex_matcher_test.go
View file

@ -21,7 +21,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/config"
"sigs.k8s.io/prometheus-adapter/pkg/config"
)
func TestReMatcherIs(t *testing.T) {

7
pkg/naming/resource_converter.go
View file

@ -25,12 +25,13 @@ import (
apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/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"
)
var (

8
pkg/resourceprovider/provider.go
View file

@ -30,11 +30,13 @@ import (
apitypes "k8s.io/apimachinery/pkg/types"
"k8s.io/klog/v2"
metrics "k8s.io/metrics/pkg/apis/metrics"
"sigs.k8s.io/metrics-server/pkg/api"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/client"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/config"
"github.com/kubernetes-sigs/prometheus-adapter/pkg/naming"
"sigs.k8s.io/prometheus-adapter/pkg/client"
"sigs.k8s.io/prometheus-adapter/pkg/config"
"sigs.k8s.io/prometheus-adapter/pkg/naming"
pmodel "github.com/prometheus/common/model"
)

12
pkg/resourceprovider/provider_test.go
View file

@ -19,8 +19,6 @@ package resourceprovider
import (
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
@ -28,11 +26,15 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/metrics/pkg/apis/metrics"
"sigs.k8s.io/metrics-server/pkg/api"
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"
config "sigs.k8s.io/prometheus-adapter/cmd/config-gen/utils"
prom "sigs.k8s.io/prometheus-adapter/pkg/client"
fakeprom "sigs.k8s.io/prometheus-adapter/pkg/client/fake"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pmodel "github.com/prometheus/common/model"
)