diff --git a/go.mod b/go.mod index 3f7a1cea..9c7b03f4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/stakater/IngressMonitorController +module github.com/stakater/IngressMonitorController/v2 go 1.15 diff --git a/main.go b/main.go index 4624c6fa..704d1a97 100644 --- a/main.go +++ b/main.go @@ -31,11 +31,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" routev1 "github.com/openshift/api/route/v1" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/controllers" - "github.com/stakater/IngressMonitorController/pkg/kube" - "github.com/stakater/IngressMonitorController/pkg/monitors" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/controllers" + "github.com/stakater/IngressMonitorController/v2/pkg/kube" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors" //+kubebuilder:scaffold:imports ) diff --git a/pkg/config/config.go b/pkg/config/config.go index 20cc60d8..4ab1de58 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -10,7 +10,7 @@ import ( yaml "gopkg.in/yaml.v2" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/stakater/IngressMonitorController/pkg/secret" + "github.com/stakater/IngressMonitorController/v2/pkg/secret" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/controllers/endpointmonitor_controller.go b/pkg/controllers/endpointmonitor_controller.go index 94b0301c..3a560eb4 100644 --- a/pkg/controllers/endpointmonitor_controller.go +++ b/pkg/controllers/endpointmonitor_controller.go @@ -22,16 +22,16 @@ import ( "time" "github.com/go-logr/logr" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/monitors" - "github.com/stakater/IngressMonitorController/pkg/util" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors" + "github.com/stakater/IngressMonitorController/v2/pkg/util" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" ) // EndpointMonitorReconciler reconciles a EndpointMonitor object diff --git a/pkg/controllers/endpointmonitor_created.go b/pkg/controllers/endpointmonitor_created.go index d14947d1..905e2508 100644 --- a/pkg/controllers/endpointmonitor_created.go +++ b/pkg/controllers/endpointmonitor_created.go @@ -1,10 +1,10 @@ package controllers import ( - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/kube/util" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/monitors" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/kube/util" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) diff --git a/pkg/controllers/endpointmonitor_deleted.go b/pkg/controllers/endpointmonitor_deleted.go index 58095286..eb01a596 100644 --- a/pkg/controllers/endpointmonitor_deleted.go +++ b/pkg/controllers/endpointmonitor_deleted.go @@ -1,9 +1,9 @@ package controllers import ( - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/monitors" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) diff --git a/pkg/controllers/endpointmonitor_updated.go b/pkg/controllers/endpointmonitor_updated.go index 2e596609..7f27e001 100644 --- a/pkg/controllers/endpointmonitor_updated.go +++ b/pkg/controllers/endpointmonitor_updated.go @@ -1,10 +1,10 @@ package controllers import ( - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/kube/util" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/monitors" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/kube/util" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) diff --git a/pkg/controllers/endpointmonitor_util.go b/pkg/controllers/endpointmonitor_util.go index 854c549a..ebcbd3a0 100644 --- a/pkg/controllers/endpointmonitor_util.go +++ b/pkg/controllers/endpointmonitor_util.go @@ -1,8 +1,8 @@ package controllers import ( - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/monitors" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors" ) func findMonitorByName(monitorService monitors.MonitorServiceProxy, monitorName string) *models.Monitor { diff --git a/pkg/kube/util/url.go b/pkg/kube/util/url.go index 7b067bcb..93c26ea5 100644 --- a/pkg/kube/util/url.go +++ b/pkg/kube/util/url.go @@ -5,14 +5,14 @@ import ( "errors" routev1 "github.com/openshift/api/route/v1" - "github.com/stakater/IngressMonitorController/pkg/kube" - "github.com/stakater/IngressMonitorController/pkg/kube/wrappers" + "github.com/stakater/IngressMonitorController/v2/pkg/kube" + "github.com/stakater/IngressMonitorController/v2/pkg/kube/wrappers" "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" logf "sigs.k8s.io/controller-runtime/pkg/log" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" ) var log = logf.Log.WithName("config") diff --git a/pkg/kube/wrappers/ingress-wrapper_test.go b/pkg/kube/wrappers/ingress-wrapper_test.go index 13192572..41977112 100644 --- a/pkg/kube/wrappers/ingress-wrapper_test.go +++ b/pkg/kube/wrappers/ingress-wrapper_test.go @@ -3,7 +3,7 @@ package wrappers import ( "testing" - "github.com/stakater/IngressMonitorController/pkg/util" + "github.com/stakater/IngressMonitorController/v2/pkg/util" "k8s.io/api/extensions/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" fakekubeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/kube/wrappers/routeWrapper_test.go b/pkg/kube/wrappers/routeWrapper_test.go index 0d3f46eb..34d2dabb 100644 --- a/pkg/kube/wrappers/routeWrapper_test.go +++ b/pkg/kube/wrappers/routeWrapper_test.go @@ -4,7 +4,7 @@ import ( "testing" routev1 "github.com/openshift/api/route/v1" - "github.com/stakater/IngressMonitorController/pkg/util" + "github.com/stakater/IngressMonitorController/v2/pkg/util" "sigs.k8s.io/controller-runtime/pkg/client" fakekubeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" ) diff --git a/pkg/monitors/appinsights/appinsights-monitor.go b/pkg/monitors/appinsights/appinsights-monitor.go index 02e80294..fdc66df2 100644 --- a/pkg/monitors/appinsights/appinsights-monitor.go +++ b/pkg/monitors/appinsights/appinsights-monitor.go @@ -12,8 +12,8 @@ import ( insightsAlert "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights" "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/kelseyhightower/envconfig" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/monitors/appinsights/appinsights-monitor_test.go b/pkg/monitors/appinsights/appinsights-monitor_test.go index c8eb8582..27b05eaf 100644 --- a/pkg/monitors/appinsights/appinsights-monitor_test.go +++ b/pkg/monitors/appinsights/appinsights-monitor_test.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights" insightsAlert "github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) func TestAppinsightsMonitorService_createWebTest(t *testing.T) { diff --git a/pkg/monitors/appinsights/util.go b/pkg/monitors/appinsights/util.go index 3dc85b41..192a1ccf 100644 --- a/pkg/monitors/appinsights/util.go +++ b/pkg/monitors/appinsights/util.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) // isAlertEnabled returns true if Alertrule is required diff --git a/pkg/monitors/gcloud/gcloud-monitor.go b/pkg/monitors/gcloud/gcloud-monitor.go index 668fb1c4..f4427685 100644 --- a/pkg/monitors/gcloud/gcloud-monitor.go +++ b/pkg/monitors/gcloud/gcloud-monitor.go @@ -14,9 +14,9 @@ import ( monitoredres "google.golang.org/genproto/googleapis/api/monitoredres" monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) var log = logf.Log.WithName("gcloud-monitor") diff --git a/pkg/monitors/gcloud/gcloud-monitor_test.go b/pkg/monitors/gcloud/gcloud-monitor_test.go index 7cdabbe8..b2ea8071 100644 --- a/pkg/monitors/gcloud/gcloud-monitor_test.go +++ b/pkg/monitors/gcloud/gcloud-monitor_test.go @@ -3,9 +3,9 @@ package gcloud import ( "testing" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) func TestAddMonitorWithCorrectValues(t *testing.T) { diff --git a/pkg/monitors/monitor-proxy.go b/pkg/monitors/monitor-proxy.go index f363cb35..f779c16f 100644 --- a/pkg/monitors/monitor-proxy.go +++ b/pkg/monitors/monitor-proxy.go @@ -1,16 +1,16 @@ package monitors import ( - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/monitors/appinsights" - "github.com/stakater/IngressMonitorController/pkg/monitors/gcloud" - "github.com/stakater/IngressMonitorController/pkg/monitors/pingdom" - "github.com/stakater/IngressMonitorController/pkg/monitors/statuscake" - "github.com/stakater/IngressMonitorController/pkg/monitors/updown" - "github.com/stakater/IngressMonitorController/pkg/monitors/uptime" - "github.com/stakater/IngressMonitorController/pkg/monitors/uptimerobot" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors/appinsights" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors/gcloud" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors/pingdom" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors/statuscake" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors/updown" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors/uptime" + "github.com/stakater/IngressMonitorController/v2/pkg/monitors/uptimerobot" logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/monitors/monitor-proxy_test.go b/pkg/monitors/monitor-proxy_test.go index 7e8171f5..9557bb2d 100644 --- a/pkg/monitors/monitor-proxy_test.go +++ b/pkg/monitors/monitor-proxy_test.go @@ -3,7 +3,7 @@ package monitors import ( "testing" - "github.com/stakater/IngressMonitorController/pkg/util" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) func TestMonitorServiceProxyOfTypeWithCorrectType(t *testing.T) { diff --git a/pkg/monitors/monitor-service.go b/pkg/monitors/monitor-service.go index a5489e2b..b1ff90d9 100644 --- a/pkg/monitors/monitor-service.go +++ b/pkg/monitors/monitor-service.go @@ -3,8 +3,8 @@ package monitors import ( "strings" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) type MonitorService interface { diff --git a/pkg/monitors/pingdom/pingdom-monitor.go b/pkg/monitors/pingdom/pingdom-monitor.go index 61111d9b..11d62bc2 100644 --- a/pkg/monitors/pingdom/pingdom-monitor.go +++ b/pkg/monitors/pingdom/pingdom-monitor.go @@ -11,10 +11,10 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "github.com/russellcardullo/go-pingdom/pingdom" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) var log = logf.Log.WithName("pingdom") diff --git a/pkg/monitors/pingdom/pingdom-monitor_test.go b/pkg/monitors/pingdom/pingdom-monitor_test.go index ffd19c38..90311113 100644 --- a/pkg/monitors/pingdom/pingdom-monitor_test.go +++ b/pkg/monitors/pingdom/pingdom-monitor_test.go @@ -4,9 +4,9 @@ import ( "net/url" "testing" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) func TestAddMonitorWithCorrectValues(t *testing.T) { diff --git a/pkg/monitors/statuscake/statuscake-mappers.go b/pkg/monitors/statuscake/statuscake-mappers.go index 558e02f7..b141d3c6 100644 --- a/pkg/monitors/statuscake/statuscake-mappers.go +++ b/pkg/monitors/statuscake/statuscake-mappers.go @@ -3,7 +3,7 @@ package statuscake import ( "strconv" - "github.com/stakater/IngressMonitorController/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) //StatusCakeMonitorMonitorToBaseMonitorMapper function to map Statuscake structure to Monitor diff --git a/pkg/monitors/statuscake/statuscake-monitor.go b/pkg/monitors/statuscake/statuscake-monitor.go index ad2bddbb..1bc03e38 100644 --- a/pkg/monitors/statuscake/statuscake-monitor.go +++ b/pkg/monitors/statuscake/statuscake-monitor.go @@ -13,9 +13,9 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) var log = logf.Log.WithName("statuscake-monitor") diff --git a/pkg/monitors/statuscake/statuscake-monitor_test.go b/pkg/monitors/statuscake/statuscake-monitor_test.go index 79ea525f..95ed0563 100644 --- a/pkg/monitors/statuscake/statuscake-monitor_test.go +++ b/pkg/monitors/statuscake/statuscake-monitor_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" "gotest.tools/assert" ) diff --git a/pkg/monitors/updown/updown-monitor.go b/pkg/monitors/updown/updown-monitor.go index 573fbc4c..e0b7f9ce 100644 --- a/pkg/monitors/updown/updown-monitor.go +++ b/pkg/monitors/updown/updown-monitor.go @@ -9,9 +9,9 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "github.com/antoineaugusti/updown" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) const ( diff --git a/pkg/monitors/updown/updown-monitor_test.go b/pkg/monitors/updown/updown-monitor_test.go index 74041984..3cf0df1f 100644 --- a/pkg/monitors/updown/updown-monitor_test.go +++ b/pkg/monitors/updown/updown-monitor_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/monitors/uptime/uptime-mappers.go b/pkg/monitors/uptime/uptime-mappers.go index 8b0b218b..49e9edbc 100644 --- a/pkg/monitors/uptime/uptime-mappers.go +++ b/pkg/monitors/uptime/uptime-mappers.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) func UptimeMonitorMonitorToBaseMonitorMapper(uptimeMonitor UptimeMonitorMonitor) *models.Monitor { diff --git a/pkg/monitors/uptime/uptime-mappers_test.go b/pkg/monitors/uptime/uptime-mappers_test.go index 7903b01d..b0262768 100644 --- a/pkg/monitors/uptime/uptime-mappers_test.go +++ b/pkg/monitors/uptime/uptime-mappers_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) func TestUptimeMonitorMonitorToBaseMonitorMapper(t *testing.T) { diff --git a/pkg/monitors/uptime/uptime-monitor.go b/pkg/monitors/uptime/uptime-monitor.go index 270dedac..70301d2d 100644 --- a/pkg/monitors/uptime/uptime-monitor.go +++ b/pkg/monitors/uptime/uptime-monitor.go @@ -16,11 +16,11 @@ import ( gocache "github.com/patrickmn/go-cache" logf "sigs.k8s.io/controller-runtime/pkg/log" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/http" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/http" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) var cache = gocache.New(5*time.Minute, 5*time.Minute) diff --git a/pkg/monitors/uptime/uptime-monitor_test.go b/pkg/monitors/uptime/uptime-monitor_test.go index 119ca8d7..88648e83 100644 --- a/pkg/monitors/uptime/uptime-monitor_test.go +++ b/pkg/monitors/uptime/uptime-monitor_test.go @@ -3,10 +3,10 @@ package uptime import ( "testing" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) func TestGetAllMonitors(t *testing.T) { diff --git a/pkg/monitors/uptimerobot/uptime-mappers.go b/pkg/monitors/uptimerobot/uptime-mappers.go index afc4e8f8..afdec174 100644 --- a/pkg/monitors/uptimerobot/uptime-mappers.go +++ b/pkg/monitors/uptimerobot/uptime-mappers.go @@ -4,9 +4,9 @@ import ( "strconv" "strings" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) func UptimeMonitorMonitorToBaseMonitorMapper(uptimeMonitor UptimeMonitorMonitor) *models.Monitor { diff --git a/pkg/monitors/uptimerobot/uptime-mappers_test.go b/pkg/monitors/uptimerobot/uptime-mappers_test.go index 685a16cc..0dfa8d31 100644 --- a/pkg/monitors/uptimerobot/uptime-mappers_test.go +++ b/pkg/monitors/uptimerobot/uptime-mappers_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) func TestUptimeMonitorMonitorToBaseMonitorMapper(t *testing.T) { diff --git a/pkg/monitors/uptimerobot/uptime-monitor.go b/pkg/monitors/uptimerobot/uptime-monitor.go index a0f18db4..9a3cac96 100644 --- a/pkg/monitors/uptimerobot/uptime-monitor.go +++ b/pkg/monitors/uptimerobot/uptime-monitor.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/http" - "github.com/stakater/IngressMonitorController/pkg/models" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/http" + "github.com/stakater/IngressMonitorController/v2/pkg/models" ) type UpTimeMonitorService struct { diff --git a/pkg/monitors/uptimerobot/uptime-monitor_test.go b/pkg/monitors/uptimerobot/uptime-monitor_test.go index fab3e6d6..7883dac3 100644 --- a/pkg/monitors/uptimerobot/uptime-monitor_test.go +++ b/pkg/monitors/uptimerobot/uptime-monitor_test.go @@ -4,10 +4,10 @@ import ( "strconv" "testing" - endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/api/v1alpha1" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" ) // Not a test case. Cleanup to remove added dummy Monitors diff --git a/pkg/monitors/uptimerobot/uptime-status-page.go b/pkg/monitors/uptimerobot/uptime-status-page.go index 1c1470f3..7c7b6a99 100644 --- a/pkg/monitors/uptimerobot/uptime-status-page.go +++ b/pkg/monitors/uptimerobot/uptime-status-page.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/stakater/IngressMonitorController/pkg/config" - "github.com/stakater/IngressMonitorController/pkg/http" - "github.com/stakater/IngressMonitorController/pkg/models" - "github.com/stakater/IngressMonitorController/pkg/util" + "github.com/stakater/IngressMonitorController/v2/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/http" + "github.com/stakater/IngressMonitorController/v2/pkg/models" + "github.com/stakater/IngressMonitorController/v2/pkg/util" logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/util/test-helpers.go b/pkg/util/test-helpers.go index 0f61ef82..637e7f20 100644 --- a/pkg/util/test-helpers.go +++ b/pkg/util/test-helpers.go @@ -4,7 +4,7 @@ import ( "testing" routev1 "github.com/openshift/api/route/v1" - "github.com/stakater/IngressMonitorController/pkg/config" + "github.com/stakater/IngressMonitorController/v2/pkg/config" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/api/extensions/v1beta1"