diff --git a/.travis.yml b/.travis.yml index 124a12a15..38ed79435 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: xenial language: go go: - "1.14.x" -go_import_path: github.com/coreos/prometheus-operator +go_import_path: github.com/prometheus-operator/prometheus-operator services: - docker before_install: diff --git a/Makefile b/Makefile index 32f8d7228..5638abc4b 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,10 @@ else ARCH=$(GOARCH) endif -GO_PKG=github.com/coreos/prometheus-operator -REPO?=quay.io/coreos/prometheus-operator -REPO_PROMETHEUS_CONFIG_RELOADER?=quay.io/coreos/prometheus-config-reloader -REPO_PROMETHEUS_OPERATOR_LINT?=quay.io/coreos/prometheus-operator-lint +GO_PKG=github.com/prometheus-operator/prometheus-operator +REPO?=quay.io/prometheus-operator/prometheus-operator +REPO_PROMETHEUS_CONFIG_RELOADER?=quay.io/prometheus-operator/prometheus-config-reloader +REPO_PROMETHEUS_OPERATOR_LINT?=quay.io/prometheus-operator/prometheus-operator-lint TAG?=$(shell git rev-parse --short HEAD) VERSION?=$(shell cat VERSION | tr -d " \t\n\r") diff --git a/README.md b/README.md index 5022042de..527b66a06 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prometheus Operator -[](https://travis-ci.org/coreos/prometheus-operator) -[](https://goreportcard.com/report/coreos/prometheus-operator) +[](https://travis-ci.com/prometheus-operator/prometheus-operator) +[](https://goreportcard.com/report/prometheus-operator/prometheus-operator) [](http://slack.k8s.io/) **Project status: *beta*** Not all planned features are completed. The API, spec, status and other user facing objects may change, but in a backward compatible way. @@ -29,7 +29,7 @@ post](https://coreos.com/blog/the-prometheus-operator.html). The Prometheus Operator uses Kubernetes [custom resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/) to simplifiy the deployment and configuration of Prometheus, Alertmanager, and related monitoring components. -[kube-prometheus](https://github.com/coreos/kube-prometheus) provides example configurations for a complete cluster monitoring +[kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) provides example configurations for a complete cluster monitoring stack based on Prometheus and the Prometheus Operator. This includes deployment of multiple Prometheus and Alertmanager instances, metrics exporters such as the node_exporter for gathering node metrics, scrape target configuration linking Prometheus to various metrics endpoints, and example alerting rules for notification of potential issues in the cluster. @@ -91,7 +91,7 @@ For more information on this feature, see the [user guide](Documentation/user-gu ## Quickstart **Note:** this quickstart does not provision an entire monitoring stack; if that is what you are looking for, -see the [kube-prometheus](https://github.com/coreos/kube-prometheus) project. If you want the whole stack, +see the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) project. If you want the whole stack, but have already applied the `bundle.yaml`, delete the bundle first (`kubectl delete -f bundle.yaml`). To quickly try out _just_ the Prometheus Operator inside a cluster, **choose a release** and run the following command: @@ -153,9 +153,9 @@ kubectl delete --ignore-not-found customresourcedefinitions \ ### Testing > Ensure that you're running tests in the following path: -> `$GOPATH/src/github.com/coreos/prometheus-operator` as tests expect paths to +> `$GOPATH/src/github.com/prometheus-operator/prometheus-operator` as tests expect paths to > match. If you're working from a fork, just add the forked repo as a remote and -> pull against your local coreos checkout before running tests. +> pull against your local prometheus-operator checkout before running tests. #### Running *unit tests*: @@ -174,7 +174,7 @@ kubectl delete --ignore-not-found customresourcedefinitions \ 1. `kind create cluster --image=kindest/node:<latest>`. e.g `v1.16.2` version. 2. `export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"` 3. `make image` - build Prometheus Operator docker image locally. -4. `for n in "operator" "config-reloader"; do kind load docker-image "quay.io/coreos/prometheus-$n:$(git rev-parse --short HEAD)"; done` - publish +4. `for n in "operator" "config-reloader"; do kind load docker-image "quay.io/prometheus-operator/prometheus-$n:$(git rev-parse --short HEAD)"; done` - publish built locally images to be accessible inside kind. 5. `make test-e2e` @@ -195,4 +195,4 @@ If you find a security vulnerability related to the Prometheus Operator, please do not report it by opening a GitHub issue, but instead please send an e-mail to the maintainers of the project found in the [OWNERS](OWNERS) file. -[operator-vs-kube]: https://github.com/coreos/prometheus-operator/issues/2510#issuecomment-476692399 +[operator-vs-kube]: https://github.com/prometheus-operator/prometheus-operator/issues/2510#issuecomment-476692399 diff --git a/cmd/operator/main.go b/cmd/operator/main.go index 28e313622..23e3f2d61 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -29,13 +29,13 @@ import ( "syscall" "time" - "github.com/coreos/prometheus-operator/pkg/admission" - alertmanagercontroller "github.com/coreos/prometheus-operator/pkg/alertmanager" - "github.com/coreos/prometheus-operator/pkg/api" - "github.com/coreos/prometheus-operator/pkg/operator" - prometheuscontroller "github.com/coreos/prometheus-operator/pkg/prometheus" - thanoscontroller "github.com/coreos/prometheus-operator/pkg/thanos" - "github.com/coreos/prometheus-operator/pkg/version" + "github.com/prometheus-operator/prometheus-operator/pkg/admission" + alertmanagercontroller "github.com/prometheus-operator/prometheus-operator/pkg/alertmanager" + "github.com/prometheus-operator/prometheus-operator/pkg/api" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" + prometheuscontroller "github.com/prometheus-operator/prometheus-operator/pkg/prometheus" + thanoscontroller "github.com/prometheus-operator/prometheus-operator/pkg/thanos" + "github.com/prometheus-operator/prometheus-operator/pkg/version" rbacproxytls "github.com/brancz/kube-rbac-proxy/pkg/tls" "github.com/go-kit/kit/log" diff --git a/cmd/po-docgen/compatibility.go b/cmd/po-docgen/compatibility.go index 272e2c564..b34b87e42 100644 --- a/cmd/po-docgen/compatibility.go +++ b/cmd/po-docgen/compatibility.go @@ -17,7 +17,7 @@ package main import ( "fmt" - "github.com/coreos/prometheus-operator/pkg/operator" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" ) func printCompatMatrixDocs() { diff --git a/cmd/po-lint/main.go b/cmd/po-lint/main.go index 876c47f4a..dc1c33269 100644 --- a/cmd/po-lint/main.go +++ b/cmd/po-lint/main.go @@ -21,8 +21,8 @@ import ( "log" "os" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "github.com/ghodss/yaml" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cmd/po-rule-migration/main.go b/cmd/po-rule-migration/main.go index 10bcb66bc..c5240b414 100644 --- a/cmd/po-rule-migration/main.go +++ b/cmd/po-rule-migration/main.go @@ -23,8 +23,8 @@ import ( "path" "path/filepath" - monitoring "github.com/coreos/prometheus-operator/pkg/apis/monitoring" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoring "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cmd/prometheus-config-reloader/main.go b/cmd/prometheus-config-reloader/main.go index fea38e9a3..fe9467440 100644 --- a/cmd/prometheus-config-reloader/main.go +++ b/cmd/prometheus-config-reloader/main.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "github.com/coreos/prometheus-operator/pkg/version" + "github.com/prometheus-operator/prometheus-operator/pkg/version" "github.com/go-kit/kit/log" "github.com/oklog/run" diff --git a/go.mod b/go.mod index d929920c9..8087199fb 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/coreos/prometheus-operator +module github.com/prometheus-operator/prometheus-operator go 1.14 diff --git a/pkg/admission/admission.go b/pkg/admission/admission.go index 7b0cd1601..ce9d84ab3 100644 --- a/pkg/admission/admission.go +++ b/pkg/admission/admission.go @@ -21,9 +21,9 @@ import ( "net/http" "strings" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/pkg/rulefmt" v1 "k8s.io/api/admission/v1" diff --git a/pkg/alertmanager/collector.go b/pkg/alertmanager/collector.go index 18c09a5b6..1c3a852a6 100644 --- a/pkg/alertmanager/collector.go +++ b/pkg/alertmanager/collector.go @@ -15,7 +15,7 @@ package alertmanager import ( - "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus/client_golang/prometheus" "k8s.io/client-go/tools/cache" diff --git a/pkg/alertmanager/operator.go b/pkg/alertmanager/operator.go index 6e21b7507..979414549 100644 --- a/pkg/alertmanager/operator.go +++ b/pkg/alertmanager/operator.go @@ -21,12 +21,12 @@ import ( "strings" "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - monitoringclient "github.com/coreos/prometheus-operator/pkg/client/versioned" - "github.com/coreos/prometheus-operator/pkg/k8sutil" - "github.com/coreos/prometheus-operator/pkg/listwatch" - "github.com/coreos/prometheus-operator/pkg/operator" - prometheusoperator "github.com/coreos/prometheus-operator/pkg/prometheus" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + monitoringclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/listwatch" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" + prometheusoperator "github.com/prometheus-operator/prometheus-operator/pkg/prometheus" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/pkg/alertmanager/statefulset.go b/pkg/alertmanager/statefulset.go index 4dd6d9898..0999d0fd0 100644 --- a/pkg/alertmanager/statefulset.go +++ b/pkg/alertmanager/statefulset.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "github.com/blang/semver" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/k8sutil" - "github.com/coreos/prometheus-operator/pkg/operator" "github.com/pkg/errors" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" ) const ( @@ -209,7 +209,7 @@ func makeStatefulSetService(p *monitoringv1.Alertmanager, config Config) *v1.Ser func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.StatefulSetSpec, error) { // Before editing 'a' create deep copy, to prevent side effects. For more - // details see https://github.com/coreos/prometheus-operator/issues/1659 + // details see https://github.com/prometheus-operator/prometheus-operator/issues/1659 a = a.DeepCopy() amBaseImage := operator.StringValOrDefault(a.Spec.BaseImage, operator.DefaultAlertmanagerBaseImage) diff --git a/pkg/alertmanager/statefulset_test.go b/pkg/alertmanager/statefulset_test.go index b77fa080b..0a5f08170 100644 --- a/pkg/alertmanager/statefulset_test.go +++ b/pkg/alertmanager/statefulset_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/operator" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/api/api.go b/pkg/api/api.go index bb8a295b5..7f00703a2 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -25,10 +25,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - monitoringclient "github.com/coreos/prometheus-operator/pkg/client/versioned" - "github.com/coreos/prometheus-operator/pkg/k8sutil" - "github.com/coreos/prometheus-operator/pkg/prometheus" + "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + monitoringclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/prometheus" ) type API struct { diff --git a/pkg/apis/monitoring/v1/register.go b/pkg/apis/monitoring/v1/register.go index e5ae14fbb..37786147a 100644 --- a/pkg/apis/monitoring/v1/register.go +++ b/pkg/apis/monitoring/v1/register.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/coreos/prometheus-operator/pkg/apis/monitoring" + "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring" ) // SchemeGroupVersion is the group version used to register these objects diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index dbce27d46..5a79df661 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -21,9 +21,9 @@ import ( sync "sync" time "time" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - monitoring "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/monitoring" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + monitoring "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/monitoring" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 42aa9c0c0..40c18d341 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -19,7 +19,7 @@ package externalversions import ( "fmt" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index bb813c731..32393671f 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -19,7 +19,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/informers/externalversions/monitoring/interface.go b/pkg/client/informers/externalversions/monitoring/interface.go index 0daf262b4..646dae81d 100644 --- a/pkg/client/informers/externalversions/monitoring/interface.go +++ b/pkg/client/informers/externalversions/monitoring/interface.go @@ -17,8 +17,8 @@ package monitoring import ( - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/monitoring/v1" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/monitoring/v1/alertmanager.go b/pkg/client/informers/externalversions/monitoring/v1/alertmanager.go index 756ac53df..6b4f8769a 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/alertmanager.go +++ b/pkg/client/informers/externalversions/monitoring/v1/alertmanager.go @@ -20,10 +20,10 @@ import ( "context" time "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/listers/monitoring/v1" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/monitoring/v1/interface.go b/pkg/client/informers/externalversions/monitoring/v1/interface.go index 8f1e00d49..e8213fcba 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/interface.go +++ b/pkg/client/informers/externalversions/monitoring/v1/interface.go @@ -17,7 +17,7 @@ package v1 import ( - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/monitoring/v1/podmonitor.go b/pkg/client/informers/externalversions/monitoring/v1/podmonitor.go index 7279f04f1..b73588b92 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/podmonitor.go +++ b/pkg/client/informers/externalversions/monitoring/v1/podmonitor.go @@ -20,10 +20,10 @@ import ( "context" time "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/listers/monitoring/v1" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/monitoring/v1/probe.go b/pkg/client/informers/externalversions/monitoring/v1/probe.go index 329e03ea2..fc683b711 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/probe.go +++ b/pkg/client/informers/externalversions/monitoring/v1/probe.go @@ -20,10 +20,10 @@ import ( "context" time "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/listers/monitoring/v1" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/monitoring/v1/prometheus.go b/pkg/client/informers/externalversions/monitoring/v1/prometheus.go index de997cecd..fc37bcfa0 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/prometheus.go +++ b/pkg/client/informers/externalversions/monitoring/v1/prometheus.go @@ -20,10 +20,10 @@ import ( "context" time "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/listers/monitoring/v1" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/monitoring/v1/prometheusrule.go b/pkg/client/informers/externalversions/monitoring/v1/prometheusrule.go index 99cccbf6b..7fd04aa15 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/prometheusrule.go +++ b/pkg/client/informers/externalversions/monitoring/v1/prometheusrule.go @@ -20,10 +20,10 @@ import ( "context" time "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/listers/monitoring/v1" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/monitoring/v1/servicemonitor.go b/pkg/client/informers/externalversions/monitoring/v1/servicemonitor.go index dca751044..04ad2447a 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/servicemonitor.go +++ b/pkg/client/informers/externalversions/monitoring/v1/servicemonitor.go @@ -20,10 +20,10 @@ import ( "context" time "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/listers/monitoring/v1" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/monitoring/v1/thanosruler.go b/pkg/client/informers/externalversions/monitoring/v1/thanosruler.go index 62b8b4195..a0f817422 100644 --- a/pkg/client/informers/externalversions/monitoring/v1/thanosruler.go +++ b/pkg/client/informers/externalversions/monitoring/v1/thanosruler.go @@ -20,10 +20,10 @@ import ( "context" time "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - internalinterfaces "github.com/coreos/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/coreos/prometheus-operator/pkg/client/listers/monitoring/v1" - versioned "github.com/coreos/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + internalinterfaces "github.com/prometheus-operator/prometheus-operator/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/listers/monitoring/v1" + versioned "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/listers/monitoring/v1/alertmanager.go b/pkg/client/listers/monitoring/v1/alertmanager.go index dcc5ee7ff..59ecf8f2f 100644 --- a/pkg/client/listers/monitoring/v1/alertmanager.go +++ b/pkg/client/listers/monitoring/v1/alertmanager.go @@ -17,7 +17,7 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/monitoring/v1/podmonitor.go b/pkg/client/listers/monitoring/v1/podmonitor.go index 290d41482..20b8c80e7 100644 --- a/pkg/client/listers/monitoring/v1/podmonitor.go +++ b/pkg/client/listers/monitoring/v1/podmonitor.go @@ -17,7 +17,7 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/monitoring/v1/probe.go b/pkg/client/listers/monitoring/v1/probe.go index 3a95067de..a9f378f5c 100644 --- a/pkg/client/listers/monitoring/v1/probe.go +++ b/pkg/client/listers/monitoring/v1/probe.go @@ -17,7 +17,7 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/monitoring/v1/prometheus.go b/pkg/client/listers/monitoring/v1/prometheus.go index d89d1d2e2..15e9ffad1 100644 --- a/pkg/client/listers/monitoring/v1/prometheus.go +++ b/pkg/client/listers/monitoring/v1/prometheus.go @@ -17,7 +17,7 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/monitoring/v1/prometheusrule.go b/pkg/client/listers/monitoring/v1/prometheusrule.go index b55bed8d1..1923fd0b9 100644 --- a/pkg/client/listers/monitoring/v1/prometheusrule.go +++ b/pkg/client/listers/monitoring/v1/prometheusrule.go @@ -17,7 +17,7 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/monitoring/v1/servicemonitor.go b/pkg/client/listers/monitoring/v1/servicemonitor.go index 4864592f6..e5bb72253 100644 --- a/pkg/client/listers/monitoring/v1/servicemonitor.go +++ b/pkg/client/listers/monitoring/v1/servicemonitor.go @@ -17,7 +17,7 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/monitoring/v1/thanosruler.go b/pkg/client/listers/monitoring/v1/thanosruler.go index a52a10b8e..dc8ddb185 100644 --- a/pkg/client/listers/monitoring/v1/thanosruler.go +++ b/pkg/client/listers/monitoring/v1/thanosruler.go @@ -17,7 +17,7 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/versioned/clientset.go b/pkg/client/versioned/clientset.go index 285758c39..d21fcfc0b 100644 --- a/pkg/client/versioned/clientset.go +++ b/pkg/client/versioned/clientset.go @@ -19,7 +19,7 @@ package versioned import ( "fmt" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/versioned/fake/clientset_generated.go b/pkg/client/versioned/fake/clientset_generated.go index 8134f7c6e..d13b7521b 100644 --- a/pkg/client/versioned/fake/clientset_generated.go +++ b/pkg/client/versioned/fake/clientset_generated.go @@ -17,9 +17,9 @@ package fake import ( - clientset "github.com/coreos/prometheus-operator/pkg/client/versioned" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" - fakemonitoringv1 "github.com/coreos/prometheus-operator/pkg/client/versioned/typed/monitoring/v1/fake" + clientset "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" + fakemonitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/versioned/fake/register.go b/pkg/client/versioned/fake/register.go index 5ce990be3..c6d3f3127 100644 --- a/pkg/client/versioned/fake/register.go +++ b/pkg/client/versioned/fake/register.go @@ -17,7 +17,7 @@ package fake import ( - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/scheme/register.go b/pkg/client/versioned/scheme/register.go index 95edfc4ba..4c7ca3ef7 100644 --- a/pkg/client/versioned/scheme/register.go +++ b/pkg/client/versioned/scheme/register.go @@ -17,7 +17,7 @@ package scheme import ( - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/alertmanager.go b/pkg/client/versioned/typed/monitoring/v1/alertmanager.go index 5b7559900..8fcdfe1b5 100644 --- a/pkg/client/versioned/typed/monitoring/v1/alertmanager.go +++ b/pkg/client/versioned/typed/monitoring/v1/alertmanager.go @@ -20,8 +20,8 @@ import ( "context" "time" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - scheme "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + scheme "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_alertmanager.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_alertmanager.go index 95b229b03..6842b4b70 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_alertmanager.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_alertmanager.go @@ -19,7 +19,7 @@ package fake import ( "context" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_monitoring_client.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_monitoring_client.go index ff42f2572..e4b0abb9f 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_monitoring_client.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_monitoring_client.go @@ -17,7 +17,7 @@ package fake import ( - v1 "github.com/coreos/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_podmonitor.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_podmonitor.go index 18eff0149..f77f10a9c 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_podmonitor.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_podmonitor.go @@ -19,7 +19,7 @@ package fake import ( "context" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_probe.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_probe.go index db3ace25d..15d7e0acf 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_probe.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_probe.go @@ -19,7 +19,7 @@ package fake import ( "context" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheus.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheus.go index b4fec2753..fee0e1038 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheus.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheus.go @@ -19,7 +19,7 @@ package fake import ( "context" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheusrule.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheusrule.go index fa5321bfd..77f17d213 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheusrule.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheusrule.go @@ -19,7 +19,7 @@ package fake import ( "context" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_servicemonitor.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_servicemonitor.go index ea6e90df3..d1cc7e6ea 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_servicemonitor.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_servicemonitor.go @@ -19,7 +19,7 @@ package fake import ( "context" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/fake/fake_thanosruler.go b/pkg/client/versioned/typed/monitoring/v1/fake/fake_thanosruler.go index bcc183cae..8af46031c 100644 --- a/pkg/client/versioned/typed/monitoring/v1/fake/fake_thanosruler.go +++ b/pkg/client/versioned/typed/monitoring/v1/fake/fake_thanosruler.go @@ -19,7 +19,7 @@ package fake import ( "context" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/versioned/typed/monitoring/v1/monitoring_client.go b/pkg/client/versioned/typed/monitoring/v1/monitoring_client.go index c0b926d84..f7a8e9edf 100644 --- a/pkg/client/versioned/typed/monitoring/v1/monitoring_client.go +++ b/pkg/client/versioned/typed/monitoring/v1/monitoring_client.go @@ -17,8 +17,8 @@ package v1 import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/versioned/typed/monitoring/v1/podmonitor.go b/pkg/client/versioned/typed/monitoring/v1/podmonitor.go index f460caddb..e803df9dd 100644 --- a/pkg/client/versioned/typed/monitoring/v1/podmonitor.go +++ b/pkg/client/versioned/typed/monitoring/v1/podmonitor.go @@ -20,8 +20,8 @@ import ( "context" "time" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - scheme "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + scheme "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/versioned/typed/monitoring/v1/probe.go b/pkg/client/versioned/typed/monitoring/v1/probe.go index deb3e5032..0f0a05d0a 100644 --- a/pkg/client/versioned/typed/monitoring/v1/probe.go +++ b/pkg/client/versioned/typed/monitoring/v1/probe.go @@ -20,8 +20,8 @@ import ( "context" "time" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - scheme "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + scheme "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/versioned/typed/monitoring/v1/prometheus.go b/pkg/client/versioned/typed/monitoring/v1/prometheus.go index 5ec0b1817..a850a0377 100644 --- a/pkg/client/versioned/typed/monitoring/v1/prometheus.go +++ b/pkg/client/versioned/typed/monitoring/v1/prometheus.go @@ -20,8 +20,8 @@ import ( "context" "time" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - scheme "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + scheme "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/versioned/typed/monitoring/v1/prometheusrule.go b/pkg/client/versioned/typed/monitoring/v1/prometheusrule.go index 21925e4bd..4222d7f8c 100644 --- a/pkg/client/versioned/typed/monitoring/v1/prometheusrule.go +++ b/pkg/client/versioned/typed/monitoring/v1/prometheusrule.go @@ -20,8 +20,8 @@ import ( "context" "time" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - scheme "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + scheme "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/versioned/typed/monitoring/v1/servicemonitor.go b/pkg/client/versioned/typed/monitoring/v1/servicemonitor.go index 9061f3f93..b9a6d3655 100644 --- a/pkg/client/versioned/typed/monitoring/v1/servicemonitor.go +++ b/pkg/client/versioned/typed/monitoring/v1/servicemonitor.go @@ -20,8 +20,8 @@ import ( "context" "time" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - scheme "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + scheme "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/versioned/typed/monitoring/v1/thanosruler.go b/pkg/client/versioned/typed/monitoring/v1/thanosruler.go index 7fc7b0163..02f06ee27 100644 --- a/pkg/client/versioned/typed/monitoring/v1/thanosruler.go +++ b/pkg/client/versioned/typed/monitoring/v1/thanosruler.go @@ -20,8 +20,8 @@ import ( "context" "time" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - scheme "github.com/coreos/prometheus-operator/pkg/client/versioned/scheme" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + scheme "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/namespace-labeler/labeler.go b/pkg/namespace-labeler/labeler.go index 55e78605f..9c74cc1cc 100644 --- a/pkg/namespace-labeler/labeler.go +++ b/pkg/namespace-labeler/labeler.go @@ -15,7 +15,7 @@ package namespacelabeler import ( - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/namespace-labeler/labeler_test.go b/pkg/namespace-labeler/labeler_test.go index 0ecb14f31..cec481969 100644 --- a/pkg/namespace-labeler/labeler_test.go +++ b/pkg/namespace-labeler/labeler_test.go @@ -18,7 +18,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index 183067001..d76192f6d 100644 --- a/pkg/operator/defaults.go +++ b/pkg/operator/defaults.go @@ -15,7 +15,7 @@ package operator import ( - "github.com/coreos/prometheus-operator/pkg/version" + "github.com/prometheus-operator/prometheus-operator/pkg/version" ) const ( @@ -29,7 +29,7 @@ const ( ) var ( - DefaultPrometheusConfigReloaderImage = "quay.io/coreos/prometheus-config-reloader:v" + version.Version + DefaultPrometheusConfigReloaderImage = "quay.io/prometheus-operator/prometheus-config-reloader:v" + version.Version PrometheusCompatibilityMatrix = []string{ "v1.4.0", diff --git a/pkg/operator/types.go b/pkg/operator/types.go index 94e822568..22cf07692 100644 --- a/pkg/operator/types.go +++ b/pkg/operator/types.go @@ -15,7 +15,7 @@ package operator import ( - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/prometheus/collector.go b/pkg/prometheus/collector.go index e61d76546..b6ff101a6 100644 --- a/pkg/prometheus/collector.go +++ b/pkg/prometheus/collector.go @@ -15,7 +15,7 @@ package prometheus import ( - "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus/client_golang/prometheus" "k8s.io/client-go/tools/cache" diff --git a/pkg/prometheus/operator.go b/pkg/prometheus/operator.go index b36911747..9bc4cb4d4 100644 --- a/pkg/prometheus/operator.go +++ b/pkg/prometheus/operator.go @@ -23,11 +23,11 @@ import ( "strings" "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - monitoringclient "github.com/coreos/prometheus-operator/pkg/client/versioned" - "github.com/coreos/prometheus-operator/pkg/k8sutil" - "github.com/coreos/prometheus-operator/pkg/listwatch" - "github.com/coreos/prometheus-operator/pkg/operator" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + monitoringclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/listwatch" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/pkg/prometheus/operator_test.go b/pkg/prometheus/operator_test.go index 0be8f2796..234f403e5 100644 --- a/pkg/prometheus/operator_test.go +++ b/pkg/prometheus/operator_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/prometheus/promcfg.go b/pkg/prometheus/promcfg.go index e6c59b760..dbea1e251 100644 --- a/pkg/prometheus/promcfg.go +++ b/pkg/prometheus/promcfg.go @@ -28,8 +28,8 @@ import ( yaml "gopkg.in/yaml.v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/operator" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" ) const ( diff --git a/pkg/prometheus/promcfg_test.go b/pkg/prometheus/promcfg_test.go index 4faa26cdf..bd565ea34 100644 --- a/pkg/prometheus/promcfg_test.go +++ b/pkg/prometheus/promcfg_test.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/operator" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" "github.com/kylelemons/godebug/pretty" ) diff --git a/pkg/prometheus/rules.go b/pkg/prometheus/rules.go index 886ff0bed..2cf855e4c 100644 --- a/pkg/prometheus/rules.go +++ b/pkg/prometheus/rules.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - namespacelabeler "github.com/coreos/prometheus-operator/pkg/namespace-labeler" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + namespacelabeler "github.com/prometheus-operator/prometheus-operator/pkg/namespace-labeler" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/prometheus/rules_test.go b/pkg/prometheus/rules_test.go index eb6c21d37..a77baceae 100644 --- a/pkg/prometheus/rules_test.go +++ b/pkg/prometheus/rules_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/prometheus/statefulset.go b/pkg/prometheus/statefulset.go index 75c291a4c..ac96d7493 100644 --- a/pkg/prometheus/statefulset.go +++ b/pkg/prometheus/statefulset.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "github.com/blang/semver" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/k8sutil" - "github.com/coreos/prometheus-operator/pkg/operator" "github.com/pkg/errors" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" ) const ( @@ -70,7 +70,7 @@ func makeStatefulSet( // p is passed in by value, not by reference. But p contains references like // to annotation map, that do not get copied on function invocation. Ensure to // prevent side effects before editing p by creating a deep copy. For more - // details see https://github.com/coreos/prometheus-operator/issues/1659. + // details see https://github.com/prometheus-operator/prometheus-operator/issues/1659. p = *p.DeepCopy() promVersion := operator.StringValOrDefault(p.Spec.Version, operator.DefaultPrometheusVersion) diff --git a/pkg/prometheus/statefulset_test.go b/pkg/prometheus/statefulset_test.go index 036ff5a99..36e6cb91e 100644 --- a/pkg/prometheus/statefulset_test.go +++ b/pkg/prometheus/statefulset_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -35,7 +35,7 @@ var ( ConfigReloaderImage: "jimmidyson/configmap-reload:latest", ConfigReloaderCPU: "100m", ConfigReloaderMemory: "25Mi", - PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest", + PrometheusConfigReloaderImage: "quay.io/prometheus-operator/prometheus-config-reloader:latest", PrometheusDefaultBaseImage: "quay.io/prometheus/prometheus", ThanosDefaultBaseImage: "quay.io/thanos/thanos", } @@ -997,7 +997,7 @@ func TestSidecarsNoCPULimits(t *testing.T) { ConfigReloaderImage: "jimmidyson/configmap-reload:latest", ConfigReloaderCPU: "0", ConfigReloaderMemory: "50Mi", - PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest", + PrometheusConfigReloaderImage: "quay.io/prometheus-operator/prometheus-config-reloader:latest", PrometheusDefaultBaseImage: "quay.io/prometheus/prometheus", ThanosDefaultBaseImage: "quay.io/thanos/thanos:v0.7.0", } @@ -1028,7 +1028,7 @@ func TestSidecarsNoMemoryLimits(t *testing.T) { ConfigReloaderImage: "jimmidyson/configmap-reload:latest", ConfigReloaderCPU: "100m", ConfigReloaderMemory: "0", - PrometheusConfigReloaderImage: "quay.io/coreos/prometheus-config-reloader:latest", + PrometheusConfigReloaderImage: "quay.io/prometheus-operator/prometheus-config-reloader:latest", PrometheusDefaultBaseImage: "quay.io/prometheus/prometheus", ThanosDefaultBaseImage: "quay.io/thanos/thanos:v0.7.0", } diff --git a/pkg/thanos/collector.go b/pkg/thanos/collector.go index c7cd4cc48..c55a3b390 100644 --- a/pkg/thanos/collector.go +++ b/pkg/thanos/collector.go @@ -15,7 +15,7 @@ package thanos import ( - v1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/prometheus/client_golang/prometheus" "k8s.io/client-go/tools/cache" ) diff --git a/pkg/thanos/operator.go b/pkg/thanos/operator.go index 11b53faff..5f2efb573 100644 --- a/pkg/thanos/operator.go +++ b/pkg/thanos/operator.go @@ -21,14 +21,14 @@ import ( "strings" "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - monitoringclient "github.com/coreos/prometheus-operator/pkg/client/versioned" - "github.com/coreos/prometheus-operator/pkg/k8sutil" - "github.com/coreos/prometheus-operator/pkg/listwatch" - "github.com/coreos/prometheus-operator/pkg/operator" "github.com/mitchellh/hashstructure" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + monitoringclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/listwatch" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" - prometheusoperator "github.com/coreos/prometheus-operator/pkg/prometheus" + prometheusoperator "github.com/prometheus-operator/prometheus-operator/pkg/prometheus" "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" diff --git a/pkg/thanos/rules.go b/pkg/thanos/rules.go index 88148b677..8289a62c6 100644 --- a/pkg/thanos/rules.go +++ b/pkg/thanos/rules.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - namespacelabeler "github.com/coreos/prometheus-operator/pkg/namespace-labeler" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + namespacelabeler "github.com/prometheus-operator/prometheus-operator/pkg/namespace-labeler" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/thanos/statefulset.go b/pkg/thanos/statefulset.go index 9bb7021ac..0687d43d0 100644 --- a/pkg/thanos/statefulset.go +++ b/pkg/thanos/statefulset.go @@ -20,10 +20,10 @@ import ( "path" "strings" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/k8sutil" - "github.com/coreos/prometheus-operator/pkg/operator" "github.com/pkg/errors" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -145,7 +145,7 @@ func makeStatefulSet(tr *monitoringv1.ThanosRuler, config Config, ruleConfigMapN func makeStatefulSetSpec(tr *monitoringv1.ThanosRuler, config Config, ruleConfigMapNames []string) (*appsv1.StatefulSetSpec, error) { // Before editing 'tr' create deep copy, to prevent side effects. For more - // details see https://github.com/coreos/prometheus-operator/issues/1659 + // details see https://github.com/prometheus-operator/prometheus-operator/issues/1659 tr = tr.DeepCopy() if tr.Spec.QueryConfig == nil && len(tr.Spec.QueryEndpoints) < 1 { diff --git a/pkg/thanos/statefulset_test.go b/pkg/thanos/statefulset_test.go index 21470aa7c..f106d092a 100644 --- a/pkg/thanos/statefulset_test.go +++ b/pkg/thanos/statefulset_test.go @@ -24,8 +24,8 @@ import ( appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" "github.com/kylelemons/godebug/pretty" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/scripts/go.mod b/scripts/go.mod index 7e3a97a48..21b06f1d0 100644 --- a/scripts/go.mod +++ b/scripts/go.mod @@ -1,4 +1,4 @@ -module github.com/coreos/prometheus-operator/tooling +module github.com/prometheus-operator/prometheus-operator/tooling go 1.14 diff --git a/scripts/tooling/Dockerfile b/scripts/tooling/Dockerfile index 509c2f22a..ee23b99df 100644 --- a/scripts/tooling/Dockerfile +++ b/scripts/tooling/Dockerfile @@ -24,7 +24,7 @@ RUN go get github.com/campoy/embedmd RUN GO111MODULE=on go get github.com/go-bindata/go-bindata/v3/go-bindata@${GO_BINDATA_VERSION} # Add po-lint -WORKDIR /go/src/github.com/coreos/prometheus-operator +WORKDIR /go/src/github.com/prometheus-operator/prometheus-operator COPY . . RUN GO111MODULE=on make po-lint && chmod +x po-lint && mv po-lint /go/bin/ @@ -34,7 +34,7 @@ RUN apt-get update -y && apt-get install -y make git jq gawk python-yaml && \ COPY --from=builder /usr/local/bin/jsonnetfmt /usr/local/bin/jsonnetfmt COPY --from=builder /go/bin/* /go/bin/ -RUN mkdir -p /go/src/github.com/coreos/prometheus-operator /.cache && \ +RUN mkdir -p /go/src/github.com/prometheus-operator/prometheus-operator /.cache && \ chmod -R 777 /go /.cache -WORKDIR /go/src/github.com/coreos/prometheus-operator +WORKDIR /go/src/github.com/prometheus-operator/prometheus-operator diff --git a/scripts/travis-push-docker-image.sh b/scripts/travis-push-docker-image.sh index 56c22f381..ff017200d 100755 --- a/scripts/travis-push-docker-image.sh +++ b/scripts/travis-push-docker-image.sh @@ -14,12 +14,15 @@ trap defer EXIT CPU_ARCHS="amd64 arm64 arm" # Push to Quay '-dev' repo if it's not a git tag or master branch build. -export REPO="quay.io/coreos/prometheus-operator" -export REPO_PROMETHEUS_CONFIG_RELOADER="quay.io/coreos/prometheus-config-reloader" +# TODO(paulfantom): coreos repository should be deprecated after v0.43.0 release and OLD_ variables should be removed +export OLD_REPO="quay.io/coreos/prometheus-operator" +export OLD_REPO_PROMETHEUS_CONFIG_RELOADER="quay.io/coreos/prometheus-config-reloader" +export REPO="quay.io/prometheus-operator/prometheus-operator" +export REPO_PROMETHEUS_CONFIG_RELOADER="quay.io/prometheus-operator/prometheus-config-reloader" if [[ "${TRAVIS_TAG}" == "" ]] && [[ "${TRAVIS_BRANCH}" != master ]]; then - export REPO="quay.io/coreos/prometheus-operator-dev" - export REPO_PROMETHEUS_CONFIG_RELOADER="quay.io/coreos/prometheus-config-reloader-dev" + export REPO="quay.io/prometheus-operator/prometheus-operator-dev" + export REPO_PROMETHEUS_CONFIG_RELOADER="quay.io/prometheus-operator/prometheus-config-reloader-dev" fi # For both git tags and git branches 'TRAVIS_BRANCH' contains the name. @@ -36,7 +39,7 @@ fi echo "${QUAY_PASSWORD}" | docker login -u "${QUAY_USERNAME}" --password-stdin quay.io export DOCKER_CLI_EXPERIMENTAL=enabled -for r in ${REPO} ${REPO_PROMETHEUS_CONFIG_RELOADER}; do +for r in ${OLD_REPO} ${OLD_REPO_PROMETHEUS_CONFIG_RELOADER} ${REPO} ${REPO_PROMETHEUS_CONFIG_RELOADER}; do # Images need to be on remote registry before creating manifests for arch in $CPU_ARCHS; do docker push "${r}:${TAG}-$arch" diff --git a/test/e2e/README.md b/test/e2e/README.md index ea9a3ba95..bc9c03ee1 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -13,5 +13,5 @@ e2e tests are written as Go test. All go test techniques apply, e.g. picking what to run, timeout length. Let's say I want to run all tests in "test/e2e/": ``` -$ go test -v ./test/e2e/ --kubeconfig "$HOME/.kube/config" --operator-image=quay.io/coreos/prometheus-operator +$ go test -v ./test/e2e/ --kubeconfig "$HOME/.kube/config" --operator-image=quay.io/prometheus-operator/prometheus-operator ``` diff --git a/test/e2e/alertmanager_test.go b/test/e2e/alertmanager_test.go index 1ba20eebb..df5e280e2 100644 --- a/test/e2e/alertmanager_test.go +++ b/test/e2e/alertmanager_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" - "github.com/coreos/prometheus-operator/pkg/alertmanager" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - testFramework "github.com/coreos/prometheus-operator/test/framework" + "github.com/prometheus-operator/prometheus-operator/pkg/alertmanager" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + testFramework "github.com/prometheus-operator/prometheus-operator/test/framework" "github.com/golang/protobuf/proto" ) diff --git a/test/e2e/denylist_test.go b/test/e2e/denylist_test.go index 2065d4d2b..c95d8e555 100644 --- a/test/e2e/denylist_test.go +++ b/test/e2e/denylist_test.go @@ -20,7 +20,7 @@ import ( "github.com/gogo/protobuf/proto" - testFramework "github.com/coreos/prometheus-operator/test/framework" + testFramework "github.com/prometheus-operator/prometheus-operator/test/framework" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go index 8249d7b63..7a6c793a7 100644 --- a/test/e2e/main_test.go +++ b/test/e2e/main_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - operatorFramework "github.com/coreos/prometheus-operator/test/framework" + operatorFramework "github.com/prometheus-operator/prometheus-operator/test/framework" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -59,7 +59,7 @@ func TestMain(m *testing.M) { opImage = flag.String( "operator-image", "", - "operator image, e.g. quay.io/coreos/prometheus-operator", + "operator image, e.g. quay.io/prometheus-operator/prometheus-operator", ) flag.Parse() diff --git a/test/e2e/prometheus_instance_namespaces_test.go b/test/e2e/prometheus_instance_namespaces_test.go index ef4ee6ce5..0e52285a2 100644 --- a/test/e2e/prometheus_instance_namespaces_test.go +++ b/test/e2e/prometheus_instance_namespaces_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - testFramework "github.com/coreos/prometheus-operator/test/framework" + testFramework "github.com/prometheus-operator/prometheus-operator/test/framework" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" api_errors "k8s.io/apimachinery/pkg/api/errors" diff --git a/test/e2e/prometheus_test.go b/test/e2e/prometheus_test.go index 74686e85a..befb425fc 100644 --- a/test/e2e/prometheus_test.go +++ b/test/e2e/prometheus_test.go @@ -38,11 +38,11 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" - "github.com/coreos/prometheus-operator/pkg/alertmanager" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/operator" - "github.com/coreos/prometheus-operator/pkg/prometheus" - testFramework "github.com/coreos/prometheus-operator/test/framework" + "github.com/prometheus-operator/prometheus-operator/pkg/alertmanager" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" + "github.com/prometheus-operator/prometheus-operator/pkg/prometheus" + testFramework "github.com/prometheus-operator/prometheus-operator/test/framework" "github.com/golang/protobuf/proto" "github.com/kylelemons/godebug/pretty" @@ -1610,7 +1610,7 @@ func testPromOnlyUpdatedOnRelevantChanges(t *testing.T) { // Adding an annotation to Prometheus lead to high CPU usage in the past // updating the Prometheus StatefulSet in a loop (See - // https://github.com/coreos/prometheus-operator/issues/1659). Added here to + // https://github.com/prometheus-operator/prometheus-operator/issues/1659). Added here to // prevent a regression. prometheus.Annotations["test-annotation"] = "test-value" @@ -2458,7 +2458,7 @@ func testOperatorNSScope(t *testing.T) { } // testPromArbitraryFSAcc tests the -// github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1.PrometheusSpec.ArbitraryFSAccessThroughSMs +// github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1.PrometheusSpec.ArbitraryFSAccessThroughSMs // configuration with the service monitor bearer token and tls assets option. func testPromArbitraryFSAcc(t *testing.T) { t.Parallel() diff --git a/test/framework/alertmanager.go b/test/framework/alertmanager.go index 9f83141fb..0d79450be 100644 --- a/test/framework/alertmanager.go +++ b/test/framework/alertmanager.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/yaml" - "github.com/coreos/prometheus-operator/pkg/alertmanager" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/alertmanager" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/pkg/textparse" diff --git a/test/framework/crd.go b/test/framework/crd.go index 4f10f25d8..bba105784 100644 --- a/test/framework/crd.go +++ b/test/framework/crd.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/coreos/prometheus-operator/pkg/apis/monitoring" + "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring" "github.com/ghodss/yaml" "github.com/pkg/errors" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" diff --git a/test/framework/framework.go b/test/framework/framework.go index f3d99c1ac..360f05c9f 100644 --- a/test/framework/framework.go +++ b/test/framework/framework.go @@ -35,8 +35,8 @@ import ( "k8s.io/client-go/tools/clientcmd" certutil "k8s.io/client-go/util/cert" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - monitoringclient "github.com/coreos/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + monitoringclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" ) @@ -269,7 +269,7 @@ func (f *Framework) CreatePrometheusOperator(ns, opImage string, namespaceAllowl for i, arg := range deploy.Spec.Template.Spec.Containers[0].Args { if strings.Contains(arg, "--prometheus-config-reloader=") { deploy.Spec.Template.Spec.Containers[0].Args[i] = "--prometheus-config-reloader=" + - "quay.io/coreos/prometheus-config-reloader:" + + "quay.io/prometheus-operator/prometheus-config-reloader:" + repoAndTag[1] } } diff --git a/test/framework/helpers.go b/test/framework/helpers.go index 9edf80cc7..d1acb3416 100644 --- a/test/framework/helpers.go +++ b/test/framework/helpers.go @@ -28,7 +28,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "github.com/coreos/prometheus-operator/pkg/k8sutil" + "github.com/prometheus-operator/prometheus-operator/pkg/k8sutil" "github.com/pkg/errors" ) diff --git a/test/framework/probe.go b/test/framework/probe.go index c9848f69c..f13bc3ce2 100644 --- a/test/framework/probe.go +++ b/test/framework/probe.go @@ -18,7 +18,7 @@ import ( "context" "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/test/framework/prometheus.go b/test/framework/prometheus.go index 3fc5261ab..0ad579296 100644 --- a/test/framework/prometheus.go +++ b/test/framework/prometheus.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/operator" - "github.com/coreos/prometheus-operator/pkg/prometheus" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/operator" + "github.com/prometheus-operator/prometheus-operator/pkg/prometheus" "github.com/pkg/errors" ) diff --git a/test/framework/prometheus_rule.go b/test/framework/prometheus_rule.go index d4dbd069c..473955ad4 100644 --- a/test/framework/prometheus_rule.go +++ b/test/framework/prometheus_rule.go @@ -19,7 +19,7 @@ import ( "fmt" "time" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/test/framework/thanosruler.go b/test/framework/thanosruler.go index 58cee4ed3..08155e75d 100644 --- a/test/framework/thanosruler.go +++ b/test/framework/thanosruler.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - monitoringv1 "github.com/coreos/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/coreos/prometheus-operator/pkg/thanos" + monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" + "github.com/prometheus-operator/prometheus-operator/pkg/thanos" "github.com/pkg/errors" ) diff --git a/test/instrumented-sample-app/Dockerfile b/test/instrumented-sample-app/Dockerfile index eb61de52d..0e856abce 100644 --- a/test/instrumented-sample-app/Dockerfile +++ b/test/instrumented-sample-app/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.12 AS builder -WORKDIR /go/src/github.com/coreos/prometheus-operator +WORKDIR /go/src/github.com/prometheus-operator/prometheus-operator COPY . . RUN cd test/instrumented-sample-app && make build FROM alpine:3.7 -COPY --from=builder /go/src/github.com/coreos/prometheus-operator/test/instrumented-sample-app/instrumented-sample-app /usr/bin/instrumented-sample-app +COPY --from=builder /go/src/github.com/prometheus-operator/prometheus-operator/test/instrumented-sample-app/instrumented-sample-app /usr/bin/instrumented-sample-app ENTRYPOINT ["/usr/bin/instrumented-sample-app"]