diff --git a/api/addtoscheme_integreatly_v1alpha1.go b/api/addtoscheme_integreatly_v1alpha1.go index 45dc750c6..b445ab877 100644 --- a/api/addtoscheme_integreatly_v1alpha1.go +++ b/api/addtoscheme_integreatly_v1alpha1.go @@ -1,7 +1,7 @@ package api import ( - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" ) func init() { diff --git a/controllers/common/auto_detect.go b/controllers/common/auto_detect.go index 6d15f38f8..106ffe912 100644 --- a/controllers/common/auto_detect.go +++ b/controllers/common/auto_detect.go @@ -1,10 +1,10 @@ package common import ( - "github.com/integr8ly/grafana-operator/internal/k8sutil" + "github.com/grafana-operator/grafana-operator/v4/internal/k8sutil" routev1 "github.com/openshift/api/route/v1" - config2 "github.com/integr8ly/grafana-operator/controllers/config" + config2 "github.com/grafana-operator/grafana-operator/v4/controllers/config" "k8s.io/apimachinery/pkg/runtime/schema" "time" diff --git a/controllers/common/clusterActions.go b/controllers/common/clusterActions.go index a2e39adf8..c400ff819 100644 --- a/controllers/common/clusterActions.go +++ b/controllers/common/clusterActions.go @@ -7,7 +7,7 @@ import ( "os" "github.com/go-logr/logr" - "github.com/integr8ly/grafana-operator/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" logf "sigs.k8s.io/controller-runtime/pkg/log" v13 "github.com/openshift/api/route/v1" diff --git a/controllers/common/clusterState.go b/controllers/common/clusterState.go index bd7e75694..d7e8ee61e 100644 --- a/controllers/common/clusterState.go +++ b/controllers/common/clusterState.go @@ -3,9 +3,9 @@ package common import ( "context" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/config" - "github.com/integr8ly/grafana-operator/controllers/model" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/model" v12 "github.com/openshift/api/route/v1" v13 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/controllers/common/dataSourcesState.go b/controllers/common/dataSourcesState.go index b61f924f6..c5ea364be 100644 --- a/controllers/common/dataSourcesState.go +++ b/controllers/common/dataSourcesState.go @@ -2,8 +2,9 @@ package common import ( "context" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/constants" + + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/config/controller_config.go b/controllers/config/controller_config.go index fb4351108..6dba2345e 100644 --- a/controllers/config/controller_config.go +++ b/controllers/config/controller_config.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" ) const ( diff --git a/controllers/config/controller_config_test.go b/controllers/config/controller_config_test.go index d74fd7b75..28b675d68 100644 --- a/controllers/config/controller_config_test.go +++ b/controllers/config/controller_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/config/grafanaIni.go b/controllers/config/grafanaIni.go index 577605315..0c67a4d2e 100644 --- a/controllers/config/grafanaIni.go +++ b/controllers/config/grafanaIni.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" ) type GrafanaIni struct { diff --git a/controllers/config/grafanaIni_test.go b/controllers/config/grafanaIni_test.go index 1c1b2cd70..90af11349 100644 --- a/controllers/config/grafanaIni_test.go +++ b/controllers/config/grafanaIni_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" "github.com/stretchr/testify/require" ) diff --git a/controllers/config/notification_controller_config.go b/controllers/config/notification_controller_config.go index 7b188e4e1..fe23d410c 100644 --- a/controllers/config/notification_controller_config.go +++ b/controllers/config/notification_controller_config.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" ) type NotificationControllerConfig struct { diff --git a/controllers/grafana/grafana_controller.go b/controllers/grafana/grafana_controller.go index 3a553bfff..2b04cdcf2 100644 --- a/controllers/grafana/grafana_controller.go +++ b/controllers/grafana/grafana_controller.go @@ -7,10 +7,10 @@ import ( "reflect" "github.com/go-logr/logr" - grafanav1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/common" - "github.com/integr8ly/grafana-operator/controllers/config" - "github.com/integr8ly/grafana-operator/controllers/model" + grafanav1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/common" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/model" routev1 "github.com/openshift/api/route/v1" v12 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" diff --git a/controllers/grafana/grafana_reconciler.go b/controllers/grafana/grafana_reconciler.go index 043e0c32b..3670dfc92 100644 --- a/controllers/grafana/grafana_reconciler.go +++ b/controllers/grafana/grafana_reconciler.go @@ -4,11 +4,11 @@ import ( "fmt" "regexp" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/common" - "github.com/integr8ly/grafana-operator/controllers/config" - "github.com/integr8ly/grafana-operator/controllers/constants" - "github.com/integr8ly/grafana-operator/controllers/model" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/common" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/controllers/model" v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/grafana/grafonnet_utils.go b/controllers/grafana/grafonnet_utils.go index ae6a9c0be..82a73843c 100644 --- a/controllers/grafana/grafonnet_utils.go +++ b/controllers/grafana/grafonnet_utils.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - grafanav1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/config" + grafanav1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" v1 "k8s.io/api/core/v1" v13 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/grafana/pluginsHelper.go b/controllers/grafana/pluginsHelper.go index 38de30c80..99ae7c327 100644 --- a/controllers/grafana/pluginsHelper.go +++ b/controllers/grafana/pluginsHelper.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - grafanav1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/config" + grafanav1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" ) type PluginsHelperImpl struct { diff --git a/controllers/grafanadashboard/dashboard_pipeline.go b/controllers/grafanadashboard/dashboard_pipeline.go index 6f7026b11..5050298c0 100644 --- a/controllers/grafanadashboard/dashboard_pipeline.go +++ b/controllers/grafanadashboard/dashboard_pipeline.go @@ -16,8 +16,8 @@ import ( "github.com/go-logr/logr" "github.com/google/go-jsonnet" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/controllers/grafanadashboard/grafana_client.go b/controllers/grafanadashboard/grafana_client.go index d0416dd5d..e515a50d3 100644 --- a/controllers/grafanadashboard/grafana_client.go +++ b/controllers/grafanadashboard/grafana_client.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" ) const ( diff --git a/controllers/grafanadashboard/grafanadashboard_controller.go b/controllers/grafanadashboard/grafanadashboard_controller.go index d72d8c09c..44086ce71 100644 --- a/controllers/grafanadashboard/grafanadashboard_controller.go +++ b/controllers/grafanadashboard/grafanadashboard_controller.go @@ -25,11 +25,11 @@ import ( "os" "github.com/go-logr/logr" - grafanav1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - integreatlyorgv1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/common" - "github.com/integr8ly/grafana-operator/controllers/config" - "github.com/integr8ly/grafana-operator/controllers/constants" + grafanav1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + integreatlyorgv1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/common" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/controllers/grafanadatasource/datasource_controller.go b/controllers/grafanadatasource/datasource_controller.go index 9a0b75793..6c987d8a3 100644 --- a/controllers/grafanadatasource/datasource_controller.go +++ b/controllers/grafanadatasource/datasource_controller.go @@ -24,9 +24,9 @@ import ( "sort" "github.com/go-logr/logr" - grafanav1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/common" - "github.com/integr8ly/grafana-operator/controllers/constants" + grafanav1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/common" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/tools/record" @@ -37,7 +37,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - integreatlyorgv1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + integreatlyorgv1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" ) // GrafanaDatasourceReconciler reconciles a GrafanaDatasource object diff --git a/controllers/grafanadatasource/datasource_pipeline.go b/controllers/grafanadatasource/datasource_pipeline.go index 8018176db..0791eed7a 100644 --- a/controllers/grafanadatasource/datasource_pipeline.go +++ b/controllers/grafanadatasource/datasource_pipeline.go @@ -2,7 +2,7 @@ package grafanadatasource import ( "github.com/ghodss/yaml" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" ) diff --git a/controllers/grafananotificationchannel/grafananotificationchannel_controller.go b/controllers/grafananotificationchannel/grafananotificationchannel_controller.go index 3bfc2d83d..3882203c9 100644 --- a/controllers/grafananotificationchannel/grafananotificationchannel_controller.go +++ b/controllers/grafananotificationchannel/grafananotificationchannel_controller.go @@ -24,8 +24,8 @@ import ( "fmt" "github.com/go-logr/logr" - grafanav1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/constants" + grafanav1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log" @@ -33,8 +33,8 @@ import ( "os" "time" - "github.com/integr8ly/grafana-operator/controllers/common" - "github.com/integr8ly/grafana-operator/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/common" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" diff --git a/controllers/grafananotificationchannel/grafananotificationchannel_pipeline.go b/controllers/grafananotificationchannel/grafananotificationchannel_pipeline.go index 1448b137a..c75160433 100644 --- a/controllers/grafananotificationchannel/grafananotificationchannel_pipeline.go +++ b/controllers/grafananotificationchannel/grafananotificationchannel_pipeline.go @@ -22,10 +22,11 @@ import ( "encoding/json" "errors" "fmt" + logf "sigs.k8s.io/controller-runtime/pkg/log" "github.com/go-logr/logr" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/controllers/model/adminUserSecret.go b/controllers/model/adminUserSecret.go index d5643f393..1e836b2b2 100644 --- a/controllers/model/adminUserSecret.go +++ b/controllers/model/adminUserSecret.go @@ -1,11 +1,12 @@ package model import ( - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/constants" + "os" + + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v12 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "os" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/controllers/model/grafanaConfig.go b/controllers/model/grafanaConfig.go index 6544cfdf2..47ca290e9 100644 --- a/controllers/model/grafanaConfig.go +++ b/controllers/model/grafanaConfig.go @@ -1,9 +1,9 @@ package model import ( - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/config" - "github.com/integr8ly/grafana-operator/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/model/grafanaDataPvc.go b/controllers/model/grafanaDataPvc.go index cd98c7762..2dc4a185a 100644 --- a/controllers/model/grafanaDataPvc.go +++ b/controllers/model/grafanaDataPvc.go @@ -1,12 +1,12 @@ package model import ( - "github.com/integr8ly/grafana-operator/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" ) func getPVCLabels(cr *v1alpha1.Grafana) map[string]string { diff --git a/controllers/model/grafanaDatasources.go b/controllers/model/grafanaDatasources.go index 547c9b8da..8ce72cb40 100644 --- a/controllers/model/grafanaDatasources.go +++ b/controllers/model/grafanaDatasources.go @@ -1,8 +1,8 @@ package model import ( - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/model/grafanaDeployment.go b/controllers/model/grafanaDeployment.go index 7030dbe38..c925b7ef5 100644 --- a/controllers/model/grafanaDeployment.go +++ b/controllers/model/grafanaDeployment.go @@ -3,10 +3,9 @@ package model import ( "fmt" - "github.com/integr8ly/grafana-operator/controllers/constants" - - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/apps/v1" v13 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/controllers/model/grafanaIngress.go b/controllers/model/grafanaIngress.go index fdb19487f..2eb91b235 100644 --- a/controllers/model/grafanaIngress.go +++ b/controllers/model/grafanaIngress.go @@ -1,8 +1,8 @@ package model import ( - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" netv1 "k8s.io/api/networking/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/model/grafanaRoute.go b/controllers/model/grafanaRoute.go index f91f69769..ede3ff51f 100644 --- a/controllers/model/grafanaRoute.go +++ b/controllers/model/grafanaRoute.go @@ -1,8 +1,8 @@ package model import ( - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "github.com/openshift/api/route/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/controllers/model/grafanaService.go b/controllers/model/grafanaService.go index a04bc804f..aea04025d 100644 --- a/controllers/model/grafanaService.go +++ b/controllers/model/grafanaService.go @@ -1,10 +1,10 @@ package model import ( - "github.com/integr8ly/grafana-operator/controllers/constants" "strconv" - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/controllers/model/grafanaServiceAccount.go b/controllers/model/grafanaServiceAccount.go index 5ae6aec91..ac301c3e7 100644 --- a/controllers/model/grafanaServiceAccount.go +++ b/controllers/model/grafanaServiceAccount.go @@ -1,8 +1,8 @@ package model import ( - "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" - "github.com/integr8ly/grafana-operator/controllers/constants" + "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" + "github.com/grafana-operator/grafana-operator/v4/controllers/constants" v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/go.mod b/go.mod index 8eb85bdfd..3797e9990 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/integr8ly/grafana-operator +module github.com/grafana-operator/grafana-operator/v4 go 1.16 diff --git a/main.go b/main.go index d42ee8a11..7b1006f00 100644 --- a/main.go +++ b/main.go @@ -20,20 +20,21 @@ import ( "context" "flag" "fmt" - "github.com/integr8ly/grafana-operator/controllers/grafananotificationchannel" "os" "runtime" - "sigs.k8s.io/controller-runtime/pkg/log/zap" "strings" - apis "github.com/integr8ly/grafana-operator/api" - "github.com/integr8ly/grafana-operator/controllers/common" - grafanaconfig "github.com/integr8ly/grafana-operator/controllers/config" - "github.com/integr8ly/grafana-operator/controllers/grafana" - "github.com/integr8ly/grafana-operator/controllers/grafanadashboard" - "github.com/integr8ly/grafana-operator/controllers/grafanadatasource" - "github.com/integr8ly/grafana-operator/internal/k8sutil" - "github.com/integr8ly/grafana-operator/version" + "github.com/grafana-operator/grafana-operator/v4/controllers/grafananotificationchannel" + "sigs.k8s.io/controller-runtime/pkg/log/zap" + + apis "github.com/grafana-operator/grafana-operator/v4/api" + "github.com/grafana-operator/grafana-operator/v4/controllers/common" + grafanaconfig "github.com/grafana-operator/grafana-operator/v4/controllers/config" + "github.com/grafana-operator/grafana-operator/v4/controllers/grafana" + "github.com/grafana-operator/grafana-operator/v4/controllers/grafanadashboard" + "github.com/grafana-operator/grafana-operator/v4/controllers/grafanadatasource" + "github.com/grafana-operator/grafana-operator/v4/internal/k8sutil" + "github.com/grafana-operator/grafana-operator/v4/version" routev1 "github.com/openshift/api/route/v1" "github.com/operator-framework/operator-lib/leader" "k8s.io/client-go/rest" @@ -45,7 +46,7 @@ import ( // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" - integreatlyorgv1alpha1 "github.com/integr8ly/grafana-operator/api/integreatly/v1alpha1" + integreatlyorgv1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1" k8sruntime "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme"