Use kmodules.xyz/monitoring-agent-api (#1206)

voyagermesh · Jul 31, 2018 · 83be45f · 83be45f
1 parent a9c916d
commit 83be45f
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 50 deletions.
diff --git a/apis/voyager/v1beta1/monitor.go b/apis/voyager/v1beta1/monitor.go
@@ -3,7 +3,7 @@ package v1beta1
 import (
 	"fmt"
 
-	"github.com/appscode/kube-mon/api"
+	"kmodules.xyz/monitoring-agent-api/api"
 )
 
 const (

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -87,7 +87,9 @@ import:
   version: v1.11.0
 - package: github.com/appscode/kutil
   version: release-8.0
-- package: github.com/appscode/kube-mon
+- package: kmodules.xyz/monitoring-agent-api
+  repo: https://github.com/kmodules/monitoring-agent-api.git
+  vcs: git
   version: release-8.0
 - package: github.com/appscode/kubernetes-webhook-util
   version: release-8.0

diff --git a/vendor/github.com/appscode/kube-mon/api/doc.go b/vendor/github.com/appscode/kube-mon/api/doc.go
diff --git a/vendor/github.com/appscode/kutil/core/v1/kubernetes.go b/vendor/github.com/appscode/kutil/core/v1/kubernetes.go
diff --git a/vendor/k8s.io/apiserver/pkg/endpoints/installer.go b/vendor/k8s.io/apiserver/pkg/endpoints/installer.go
diff --git a/vendor/github.com/appscode/kube-mon/LICENSE → ...kmodules.xyz/monitoring-agent-api/LICENSE b/vendor/github.com/appscode/kube-mon/LICENSE → ...kmodules.xyz/monitoring-agent-api/LICENSE
diff --git a/...ub.com/appscode/kube-mon/agents/agents.go → ...xyz/monitoring-agent-api/agents/agents.go b/...ub.com/appscode/kube-mon/agents/agents.go → ...xyz/monitoring-agent-api/agents/agents.go
@@ -1,12 +1,12 @@
 package agents
 
 import (
-	"github.com/appscode/kube-mon/agents/coreosprometheusoperator"
-	"github.com/appscode/kube-mon/agents/prometheusbuiltin"
-	"github.com/appscode/kube-mon/api"
 	prom "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
 	ecs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
 	"k8s.io/client-go/kubernetes"
+	"kmodules.xyz/monitoring-agent-api/agents/coreosprometheusoperator"
+	"kmodules.xyz/monitoring-agent-api/agents/prometheusbuiltin"
+	"kmodules.xyz/monitoring-agent-api/api"
 )
 
 func New(at api.AgentType, k8sClient kubernetes.Interface, extClient ecs.ApiextensionsV1beta1Interface, promClient prom.MonitoringV1Interface) api.Agent {

diff --git a/...on/agents/coreosprometheusoperator/lib.go → ...pi/agents/coreosprometheusoperator/lib.go b/...on/agents/coreosprometheusoperator/lib.go → ...pi/agents/coreosprometheusoperator/lib.go
@@ -4,14 +4,14 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/appscode/kube-mon/api"
 	"github.com/appscode/kutil"
 	prom "github.com/coreos/prometheus-operator/pkg/client/monitoring/v1"
 	ecs "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
 	kerr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes"
+	"kmodules.xyz/monitoring-agent-api/api"
 )
 
 // PrometheusCoreosOperator creates `ServiceMonitor` so that CoreOS Prometheus operator can generate necessary config for Prometheus.

diff --git a/vendor/kmodules.xyz/monitoring-agent-api/agents/doc.go b/vendor/kmodules.xyz/monitoring-agent-api/agents/doc.go
@@ -0,0 +1 @@
+package agents // import "kmodules.xyz/monitoring-agent-api/agents"
diff --git a/.../kube-mon/agents/prometheusbuiltin/lib.go → ...agent-api/agents/prometheusbuiltin/lib.go b/.../kube-mon/agents/prometheusbuiltin/lib.go → ...agent-api/agents/prometheusbuiltin/lib.go
@@ -3,13 +3,13 @@ package prometheusbuiltin
 import (
 	"fmt"
 
-	"github.com/appscode/kube-mon/api"
 	"github.com/appscode/kutil"
 	core_util "github.com/appscode/kutil/core/v1"
 	core "k8s.io/api/core/v1"
 	kerr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+	"kmodules.xyz/monitoring-agent-api/api"
 )
 
 // PrometheusBuiltin applies `prometheus.io` annotations on stats service so that Prometheus can scrape this stats service.

diff --git a/vendor/kmodules.xyz/monitoring-agent-api/api/doc.go b/vendor/kmodules.xyz/monitoring-agent-api/api/doc.go
@@ -0,0 +1,3 @@
+// +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+package api // import "kmodules.xyz/monitoring-agent-api/api"
diff --git a/...ppscode/kube-mon/api/openapi_generated.go → ...toring-agent-api/api/openapi_generated.go b/...ppscode/kube-mon/api/openapi_generated.go → ...toring-agent-api/api/openapi_generated.go
diff --git a/...github.com/appscode/kube-mon/api/types.go → ...les.xyz/monitoring-agent-api/api/types.go b/...github.com/appscode/kube-mon/api/types.go → ...les.xyz/monitoring-agent-api/api/types.go
diff --git a/...ode/kube-mon/api/zz_generated.deepcopy.go → ...ng-agent-api/api/zz_generated.deepcopy.go b/...ode/kube-mon/api/zz_generated.deepcopy.go → ...ng-agent-api/api/zz_generated.deepcopy.go
diff --git a/vendor/kmodules.xyz/monitoring-agent-api/parser/doc.go b/vendor/kmodules.xyz/monitoring-agent-api/parser/doc.go
@@ -0,0 +1 @@
+package parser // import "kmodules.xyz/monitoring-agent-api/parser"
diff --git a/...or/github.com/appscode/kube-mon/parser.go → ...xyz/monitoring-agent-api/parser/parser.go b/...or/github.com/appscode/kube-mon/parser.go → ...xyz/monitoring-agent-api/parser/parser.go
@@ -1,13 +1,12 @@
-package monitoring
+package parser
 
 import (
 	"fmt"
-
 	"path"
 
-	"github.com/appscode/kube-mon/api"
 	"github.com/appscode/kutil"
 	"github.com/appscode/kutil/meta"
+	"kmodules.xyz/monitoring-agent-api/api"
 )
 
 const (

diff --git a/...code/kube-mon/prometheus/v1/kubernetes.go → ...ing-agent-api/prometheus/v1/kubernetes.go b/...code/kube-mon/prometheus/v1/kubernetes.go → ...ing-agent-api/prometheus/v1/kubernetes.go