Skip to content

Commit

Permalink
Use prometheus-operator v1 api/client (#658)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tamalsaha
tamalsaha committed Oct 23, 2017
1 parent 0370fef commit 9be06ad
Show file tree
Hide file tree
Showing 16 changed files with 70 additions and 61 deletions.
4 changes: 2 additions & 2 deletions glide.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/cmds/check.go
View file
Expand Up @@ -7,7 +7,7 @@ import (
api "github.com/appscode/voyager/apis/voyager/v1beta1"
acs "github.com/appscode/voyager/client/typed/voyager/v1beta1"
"github.com/appscode/voyager/pkg/operator"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
"github.com/ghodss/yaml"
"github.com/spf13/cobra"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmds/run.go
View file
Expand Up @@ -16,7 +16,7 @@ import (
haproxy "github.com/appscode/voyager/pkg/haproxy"
"github.com/appscode/voyager/pkg/migrator"
"github.com/appscode/voyager/pkg/operator"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
Expand Down
6 changes: 3 additions & 3 deletions pkg/ingress/controller.go
View file
Expand Up @@ -13,7 +13,7 @@ import (
acs "github.com/appscode/voyager/client/typed/voyager/v1beta1"
"github.com/appscode/voyager/pkg/config"
_ "github.com/appscode/voyager/third_party/forked/cloudprovider/providers"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
vault "github.com/hashicorp/vault/api"
core "k8s.io/api/core/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
Expand All @@ -35,7 +35,7 @@ type controller struct {
KubeClient kubernetes.Interface
CRDClient apiextensionsclient.Interface
VoyagerClient acs.VoyagerV1beta1Interface
PromClient pcm.MonitoringV1alpha1Interface
PromClient pcm.MonitoringV1Interface
ServiceLister core_listers.ServiceLister
EndpointsLister core_listers.EndpointsLister

Expand All @@ -58,7 +58,7 @@ func NewController(
kubeClient kubernetes.Interface,
crdClient apiextensionsclient.Interface,
extClient acs.VoyagerV1beta1Interface,
promClient pcm.MonitoringV1alpha1Interface,
promClient pcm.MonitoringV1Interface,
serviceLister core_listers.ServiceLister,
endpointsLister core_listers.EndpointsLister,
opt config.Options,
Expand Down
4 changes: 2 additions & 2 deletions pkg/ingress/hostport.go
View file
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/appscode/voyager/third_party/forked/cloudprovider"
_ "github.com/appscode/voyager/third_party/forked/cloudprovider/providers"
fakecloudprovider "github.com/appscode/voyager/third_party/forked/cloudprovider/providers/fake"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
apps "k8s.io/api/apps/v1beta1"
core "k8s.io/api/core/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
Expand All @@ -41,7 +41,7 @@ func NewHostPortController(
kubeClient kubernetes.Interface,
crdClient apiextensionsclient.Interface,
extClient acs.VoyagerV1beta1Interface,
promClient pcm.MonitoringV1alpha1Interface,
promClient pcm.MonitoringV1Interface,
serviceLister core_listers.ServiceLister,
endpointsLister core_listers.EndpointsLister,
opt config.Options,
Expand Down
4 changes: 2 additions & 2 deletions pkg/ingress/internal.go
View file
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/appscode/voyager/pkg/eventer"
"github.com/appscode/voyager/pkg/monitor"
_ "github.com/appscode/voyager/third_party/forked/cloudprovider/providers"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
apps "k8s.io/api/apps/v1beta1"
core "k8s.io/api/core/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
Expand All @@ -37,7 +37,7 @@ func NewInternalController(
kubeClient kubernetes.Interface,
crdClient apiextensionsclient.Interface,
extClient acs.VoyagerV1beta1Interface,
promClient pcm.MonitoringV1alpha1Interface,
promClient pcm.MonitoringV1Interface,
serviceLister core_listers.ServiceLister,
endpointsLister core_listers.EndpointsLister,
opt config.Options,
Expand Down
4 changes: 2 additions & 2 deletions pkg/ingress/loadbalancer.go
View file
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/appscode/voyager/pkg/eventer"
"github.com/appscode/voyager/pkg/monitor"
_ "github.com/appscode/voyager/third_party/forked/cloudprovider/providers"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
apps "k8s.io/api/apps/v1beta1"
core "k8s.io/api/core/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
Expand All @@ -38,7 +38,7 @@ func NewLoadBalancerController(
kubeClient kubernetes.Interface,
crdClient apiextensionsclient.Interface,
extClient acs.VoyagerV1beta1Interface,
promClient pcm.MonitoringV1alpha1Interface,
promClient pcm.MonitoringV1Interface,
serviceLister core_listers.ServiceLister,
endpointsLister core_listers.EndpointsLister,
opt config.Options,
Expand Down
4 changes: 2 additions & 2 deletions pkg/ingress/nodeport.go
View file
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/appscode/voyager/third_party/forked/cloudprovider"
_ "github.com/appscode/voyager/third_party/forked/cloudprovider/providers"
fakecloudprovider "github.com/appscode/voyager/third_party/forked/cloudprovider/providers/fake"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
apps "k8s.io/api/apps/v1beta1"
core "k8s.io/api/core/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
Expand All @@ -42,7 +42,7 @@ func NewNodePortController(
kubeClient kubernetes.Interface,
crdClient apiextensionsclient.Interface,
extClient acs.VoyagerV1beta1Interface,
promClient pcm.MonitoringV1alpha1Interface,
promClient pcm.MonitoringV1Interface,
serviceLister core_listers.ServiceLister,
endpointsLister core_listers.EndpointsLister,
opt config.Options,
Expand Down
14 changes: 6 additions & 8 deletions pkg/monitor/prometheus.go
View file
Expand Up @@ -6,9 +6,7 @@ import (
"reflect"

api "github.com/appscode/voyager/apis/voyager/v1beta1"
"github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
_ "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
prom "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
prom "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
kerr "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -17,11 +15,11 @@ import (

type PrometheusController struct {
kubeClient kubernetes.Interface
promClient v1alpha1.MonitoringV1alpha1Interface
promClient prom.MonitoringV1Interface
crdClient apiextensionsclient.Interface
}

func NewPrometheusController(kubeClient kubernetes.Interface, crdClient apiextensionsclient.Interface, promClient v1alpha1.MonitoringV1alpha1Interface) Monitor {
func NewPrometheusController(kubeClient kubernetes.Interface, crdClient apiextensionsclient.Interface, promClient prom.MonitoringV1Interface) Monitor {
return &PrometheusController{
kubeClient: kubeClient,
crdClient: crdClient,
Expand All @@ -31,21 +29,21 @@ func NewPrometheusController(kubeClient kubernetes.Interface, crdClient apiexten

func (c *PrometheusController) AddMonitor(r *api.Ingress, spec *api.MonitorSpec) error {
if !c.SupportsCoreOSOperator() {
return errors.New("Cluster does not support CoreOS Prometheus operator")
return errors.New("cluster does not support CoreOS Prometheus operator")
}
return c.ensureServiceMonitor(r, spec, spec)
}

func (c *PrometheusController) UpdateMonitor(r *api.Ingress, old, new *api.MonitorSpec) error {
if !c.SupportsCoreOSOperator() {
return errors.New("Cluster does not support CoreOS Prometheus operator")
return errors.New("cluster does not support CoreOS Prometheus operator")
}
return c.ensureServiceMonitor(r, old, new)
}

func (c *PrometheusController) DeleteMonitor(r *api.Ingress, spec *api.MonitorSpec) error {
if !c.SupportsCoreOSOperator() {
return errors.New("Cluster does not support CoreOS Prometheus operator")
return errors.New("cluster does not support CoreOS Prometheus operator")
}
if err := c.promClient.ServiceMonitors(spec.Prometheus.Namespace).Delete(getServiceMonitorName(r), nil); !kerr.IsNotFound(err) {
return err
Expand Down
6 changes: 3 additions & 3 deletions pkg/operator/operator.go
View file
Expand Up @@ -9,7 +9,7 @@ import (
tcs "github.com/appscode/voyager/client/typed/voyager/v1beta1"
"github.com/appscode/voyager/pkg/config"
"github.com/appscode/voyager/pkg/eventer"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
pcm "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
kerr "k8s.io/apimachinery/pkg/api/errors"
Expand All @@ -26,7 +26,7 @@ type Operator struct {
KubeClient kubernetes.Interface
CRDClient apiextensionsclient.Interface
VoyagerClient tcs.VoyagerV1beta1Interface
PromClient pcm.MonitoringV1alpha1Interface
PromClient pcm.MonitoringV1Interface
ServiceLister core.ServiceLister
EndpointsLister core.EndpointsLister
Opt config.Options
Expand All @@ -39,7 +39,7 @@ func New(
kubeClient kubernetes.Interface,
crdClient apiextensionsclient.Interface,
extClient tcs.VoyagerV1beta1Interface,
promClient pcm.MonitoringV1alpha1Interface,
promClient pcm.MonitoringV1Interface,
opt config.Options,
) *Operator {
return &Operator{
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/servicemonitors.go
View file
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/appscode/go/log"
"github.com/appscode/kutil"
api "github.com/appscode/voyager/apis/voyager/v1beta1"
prom "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1alpha1"
prom "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
Expand Down
3 changes: 2 additions & 1 deletion ...lient/monitoring/v1alpha1/alertmanager.go → .../pkg/client/monitoring/v1/alertmanager.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 12 additions & 11 deletions .../pkg/client/monitoring/v1alpha1/client.go → ...erator/pkg/client/monitoring/v1/client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../client/monitoring/v1alpha1/prometheus.go → ...or/pkg/client/monitoring/v1/prometheus.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ent/monitoring/v1alpha1/servicemonitor.go → ...kg/client/monitoring/v1/servicemonitor.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9be06ad

Please sign in to comment.