mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-16 09:16:38 +00:00
Code Activity

repository migration to prometheus-operator organization

Browse source
This commit is contained in:
paulfantom 2020-08-05 13:13:46 +02:00
parent a9657237c4
commit 67780ccc45
No known key found for this signature in database
GPG key ID: 12AE0185401674E7
91 changed files with 202 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -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:

8
Makefile
View file

@ -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")

16
README.md
View file

@ -1,6 +1,6 @@
# Prometheus Operator
[![Build Status](https://travis-ci.org/coreos/prometheus-operator.svg?branch=master)](https://travis-ci.org/coreos/prometheus-operator)
[![Go Report Card](https://goreportcard.com/badge/coreos/prometheus-operator "Go Report Card")](https://goreportcard.com/report/coreos/prometheus-operator)
[![Build Status](https://travis-ci.com/prometheus-operator/prometheus-operator.svg?branch=master)](https://travis-ci.com/prometheus-operator/prometheus-operator)
[![Go Report Card](https://goreportcard.com/badge/prometheus-operator/prometheus-operator "Go Report Card")](https://goreportcard.com/report/prometheus-operator/prometheus-operator)
[![Slack](https://img.shields.io/badge/join%20slack-%23prometheus--operator-brightgreen.svg)](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

14
cmd/operator/main.go
View file

@ -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"

2
cmd/po-docgen/compatibility.go
View file

@ -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() {

2
cmd/po-lint/main.go
View file

@ -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"
)

4
cmd/po-rule-migration/main.go
View file

@ -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"

2
cmd/prometheus-config-reloader/main.go
View file

@ -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"

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/coreos/prometheus-operator
module github.com/prometheus-operator/prometheus-operator
go 1.14

2
pkg/admission/admission.go
View file

@ -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"

2
pkg/alertmanager/collector.go
View file

@ -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"

12
pkg/alertmanager/operator.go
View file

@ -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"

8
pkg/alertmanager/statefulset.go
View file

@ -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)

4
pkg/alertmanager/statefulset_test.go
View file

@ -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"

8
pkg/api/api.go
View file

@ -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 {

2
pkg/apis/monitoring/v1/register.go
View file

@ -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

6
pkg/client/informers/externalversions/factory.go
View file

@ -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"

2
pkg/client/informers/externalversions/generic.go
View file

@ -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"
)

2
pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
View file

@ -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"

4
pkg/client/informers/externalversions/monitoring/interface.go
View file

@ -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.

8
pkg/client/informers/externalversions/monitoring/v1/alertmanager.go
View file

@ -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"

2
pkg/client/informers/externalversions/monitoring/v1/interface.go
View file

@ -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.

8
pkg/client/informers/externalversions/monitoring/v1/podmonitor.go
View file

@ -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"

8
pkg/client/informers/externalversions/monitoring/v1/probe.go
View file

@ -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"

8
pkg/client/informers/externalversions/monitoring/v1/prometheus.go
View file

@ -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"

8
pkg/client/informers/externalversions/monitoring/v1/prometheusrule.go
View file

@ -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"

8
pkg/client/informers/externalversions/monitoring/v1/servicemonitor.go
View file

@ -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"

8
pkg/client/informers/externalversions/monitoring/v1/thanosruler.go
View file

@ -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"

2
pkg/client/listers/monitoring/v1/alertmanager.go
View file

@ -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"

2
pkg/client/listers/monitoring/v1/podmonitor.go
View file

@ -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"

2
pkg/client/listers/monitoring/v1/probe.go
View file

@ -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"

2
pkg/client/listers/monitoring/v1/prometheus.go
View file

@ -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"

2
pkg/client/listers/monitoring/v1/prometheusrule.go
View file

@ -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"

2
pkg/client/listers/monitoring/v1/servicemonitor.go
View file

@ -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"

2
pkg/client/listers/monitoring/v1/thanosruler.go
View file

@ -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"

2
pkg/client/versioned/clientset.go
View file

@ -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"

6
pkg/client/versioned/fake/clientset_generated.go
View file

@ -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"

2
pkg/client/versioned/fake/register.go
View file

@ -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"

2
pkg/client/versioned/scheme/register.go
View file

@ -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"

4
pkg/client/versioned/typed/monitoring/v1/alertmanager.go
View file

@ -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"

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_alertmanager.go
View file

@ -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"

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_monitoring_client.go
View file

@ -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"
)

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_podmonitor.go
View file

@ -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"

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_probe.go
View file

@ -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"

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheus.go
View file

@ -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"

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_prometheusrule.go
View file

@ -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"

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_servicemonitor.go
View file

@ -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"

2
pkg/client/versioned/typed/monitoring/v1/fake/fake_thanosruler.go
View file

@ -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"

4
pkg/client/versioned/typed/monitoring/v1/monitoring_client.go
View file

@ -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"
)

4
pkg/client/versioned/typed/monitoring/v1/podmonitor.go
View file

@ -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"

4
pkg/client/versioned/typed/monitoring/v1/probe.go
View file

@ -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"

4
pkg/client/versioned/typed/monitoring/v1/prometheus.go
View file

@ -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"

4
pkg/client/versioned/typed/monitoring/v1/prometheusrule.go
View file

@ -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"

4
pkg/client/versioned/typed/monitoring/v1/servicemonitor.go
View file

@ -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"

4
pkg/client/versioned/typed/monitoring/v1/thanosruler.go
View file

@ -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"

2
pkg/namespace-labeler/labeler.go
View file

@ -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"

2
pkg/namespace-labeler/labeler_test.go
View file

@ -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"

4
pkg/operator/defaults.go
View file

@ -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",

2
pkg/operator/types.go
View file

@ -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"
)

2
pkg/prometheus/collector.go
View file

@ -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"

10
pkg/prometheus/operator.go
View file

@ -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"

2
pkg/prometheus/operator_test.go
View file

@ -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"

4
pkg/prometheus/promcfg.go
View file

@ -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 (

4
pkg/prometheus/promcfg_test.go
View file

@ -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"
)

4
pkg/prometheus/rules.go
View file

@ -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"

2
pkg/prometheus/rules_test.go
View file

@ -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"
)

8
pkg/prometheus/statefulset.go
View file

@ -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)

8
pkg/prometheus/statefulset_test.go
View file

@ -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",
}

2
pkg/thanos/collector.go
View file

@ -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"
)

12
pkg/thanos/operator.go
View file

@ -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"

4
pkg/thanos/rules.go
View file

@ -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"

8
pkg/thanos/statefulset.go
View file

@ -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 {

2
pkg/thanos/statefulset_test.go
View file

@ -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"
)

2
scripts/go.mod
View file

@ -1,4 +1,4 @@
module github.com/coreos/prometheus-operator/tooling
module github.com/prometheus-operator/prometheus-operator/tooling
go 1.14

6
scripts/tooling/Dockerfile
View file

@ -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

13
scripts/travis-push-docker-image.sh
View file

@ -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"

2
test/e2e/README.md
View file

@ -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
```

6
test/e2e/alertmanager_test.go
View file

@ -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"
)

2
test/e2e/denylist_test.go
View file

@ -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"

4
test/e2e/main_test.go
View file

@ -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()

2
test/e2e/prometheus_instance_namespaces_test.go
View file

@ -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"

14
test/e2e/prometheus_test.go
View file

@ -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()

4
test/framework/alertmanager.go
View file

@ -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"

2
test/framework/crd.go
View file

@ -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"

6
test/framework/framework.go
View file

@ -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]
}
}

2
test/framework/helpers.go
View file

@ -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"
)

2
test/framework/probe.go
View file

@ -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"

6
test/framework/prometheus.go
View file

@ -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"
)

2
test/framework/prometheus_rule.go
View file

@ -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"

4
test/framework/thanosruler.go
View file

@ -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"
)

4
test/instrumented-sample-app/Dockerfile
View file

@ -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"]