Skip to content

Commit

Permalink
update go.mod to include /v5 suffix (#981)
Browse files Browse the repository at this point in the history
  • Loading branch information
@addreas
addreas committed Apr 4, 2023
1 parent 2a6bd89 commit 461a0cf
Show file tree
Hide file tree
Showing 28 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion controllers/autodetect/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http/httptest"
"testing"

"github.com/grafana-operator/grafana-operator/controllers/autodetect"
"github.com/grafana-operator/grafana-operator/v5/controllers/autodetect"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
8 changes: 4 additions & 4 deletions controllers/client/grafana_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"net/url"
"time"

"github.com/grafana-operator/grafana-operator/controllers/metrics"
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
v1 "k8s.io/api/core/v1"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/config"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
grapi "github.com/grafana/grafana-api-golang-client"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
4 changes: 2 additions & 2 deletions controllers/controller_shared.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"context"
"encoding/json"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
10 changes: 5 additions & 5 deletions controllers/dashboard_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"strings"
"time"

"github.com/grafana-operator/grafana-operator/embeds"
"github.com/grafana-operator/grafana-operator/v5/embeds"

"github.com/go-logr/logr"
"github.com/grafana-operator/grafana-operator/api/v1beta1"
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
"github.com/grafana-operator/grafana-operator/controllers/fetchers"
"github.com/grafana-operator/grafana-operator/controllers/metrics"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
"github.com/grafana-operator/grafana-operator/v5/controllers/fetchers"
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
grapi "github.com/grafana/grafana-api-golang-client"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/dashboard_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package controllers
import (
"testing"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
6 changes: 3 additions & 3 deletions controllers/datasource_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ import (

v1 "k8s.io/api/core/v1"

"github.com/grafana-operator/grafana-operator/controllers/metrics"
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"

"github.com/go-logr/logr"
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
gapi "github.com/grafana/grafana-api-golang-client"
"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/log"

v1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
v1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
)

// GrafanaDatasourceReconciler reconciles a GrafanaDatasource object
Expand Down
2 changes: 1 addition & 1 deletion controllers/fetchers/jsonnet_fetcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"

"github.com/google/go-jsonnet"
"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
)

// EmbedFSImporter "imports" data from an in-memory embedFS.
Expand Down
4 changes: 2 additions & 2 deletions controllers/fetchers/jsonnet_fetcher_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"reflect"
"testing"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/embeds"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/embeds"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
6 changes: 3 additions & 3 deletions controllers/fetchers/url_fetcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"net/url"
"time"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
"github.com/grafana-operator/grafana-operator/controllers/metrics"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/fetchers/url_fetcher_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http/httptest"
"testing"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/stretchr/testify/assert"
)

Expand Down
8 changes: 4 additions & 4 deletions controllers/grafana_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"time"

"github.com/go-logr/logr"
"github.com/grafana-operator/grafana-operator/controllers/metrics"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers/grafana"
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers/grafana"
v1 "k8s.io/api/apps/v1"
v12 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand All @@ -35,7 +35,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions controllers/grafanafolder_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ import (
"time"

"github.com/go-logr/logr"
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
"github.com/grafana-operator/grafana-operator/controllers/metrics"
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
grapi "github.com/grafana/grafana-api-golang-client"
"k8s.io/apimachinery/pkg/api/errors"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
)

// GrafanaFolderReconciler reconciles a GrafanaFolder object
Expand Down
2 changes: 1 addition & 1 deletion controllers/model/dashboard_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package model
import (
"fmt"

grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/model/grafana_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package model
import (
"fmt"

grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
routev1 "github.com/openshift/api/route/v1"
v13 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
Expand Down
8 changes: 4 additions & 4 deletions controllers/reconcilers/grafana/admin_secret_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"os"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/config"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
4 changes: 2 additions & 2 deletions controllers/reconcilers/grafana/complete_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package grafana
import (
"context"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/log"
)
Expand Down
8 changes: 4 additions & 4 deletions controllers/reconcilers/grafana/config_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package grafana
import (
"context"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/config"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand Down
8 changes: 4 additions & 4 deletions controllers/reconcilers/grafana/deployment_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"fmt"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
config2 "github.com/grafana-operator/grafana-operator/controllers/config"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
config2 "github.com/grafana-operator/grafana-operator/v5/controllers/config"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
v12 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
8 changes: 4 additions & 4 deletions controllers/reconcilers/grafana/grafana_service_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"strconv"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/config"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr"
Expand Down
4 changes: 2 additions & 2 deletions controllers/reconcilers/grafana/grafana_service_reconciler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package grafana
import (
"testing"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/config"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions controllers/reconcilers/grafana/ingress_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
routev1 "github.com/openshift/api/route/v1"
v1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
6 changes: 3 additions & 3 deletions controllers/reconcilers/grafana/plugins_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"encoding/json"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
6 changes: 3 additions & 3 deletions controllers/reconcilers/grafana/pvc_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package grafana
import (
"context"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand Down
6 changes: 3 additions & 3 deletions controllers/reconcilers/grafana/service_account_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package grafana
import (
"context"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers/model"
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand Down
2 changes: 1 addition & 1 deletion controllers/reconcilers/reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package reconcilers
import (
"context"

"github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
//+kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/grafana-operator/grafana-operator
module github.com/grafana-operator/grafana-operator/v5

go 1.19

Expand Down
6 changes: 3 additions & 3 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
"github.com/grafana-operator/grafana-operator/controllers"
"github.com/grafana-operator/grafana-operator/controllers/autodetect"
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
"github.com/grafana-operator/grafana-operator/v5/controllers"
"github.com/grafana-operator/grafana-operator/v5/controllers/autodetect"
//+kubebuilder:scaffold:imports
)

Expand Down

0 comments on commit 461a0cf

Please sign in to comment.