Skip to content

Commit 461a0cf

Browse files
addreasaddreas
authored
update go.mod to include /v5 suffix (#981)
1 parent 2a6bd89 commit 461a0cf

28 files changed

+71
-71
lines changed

‎controllers/autodetect/main_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http/httptest"
77
"testing"
88

9-
"github.com/grafana-operator/grafana-operator/controllers/autodetect"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/autodetect"
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎controllers/client/grafana_client.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"net/url"
88
"time"
99

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

13-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
14-
"github.com/grafana-operator/grafana-operator/controllers/config"
15-
"github.com/grafana-operator/grafana-operator/controllers/model"
13+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
14+
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
15+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
1616
grapi "github.com/grafana/grafana-api-golang-client"
1717
"sigs.k8s.io/controller-runtime/pkg/client"
1818
)

‎controllers/controller_shared.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"context"
66
"encoding/json"
77

8-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
9-
"github.com/grafana-operator/grafana-operator/controllers/model"
8+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
1010
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"k8s.io/apimachinery/pkg/runtime"
1212
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/dashboard_controller.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/grafana-operator/grafana-operator/embeds"
28+
"github.com/grafana-operator/grafana-operator/v5/embeds"
2929

3030
"github.com/go-logr/logr"
31-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
32-
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
33-
"github.com/grafana-operator/grafana-operator/controllers/fetchers"
34-
"github.com/grafana-operator/grafana-operator/controllers/metrics"
31+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
32+
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
33+
"github.com/grafana-operator/grafana-operator/v5/controllers/fetchers"
34+
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
3535
grapi "github.com/grafana/grafana-api-golang-client"
3636
"k8s.io/apimachinery/pkg/api/errors"
3737
"k8s.io/apimachinery/pkg/runtime"

‎controllers/dashboard_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package controllers
1919
import (
2020
"testing"
2121

22-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
22+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
2323
"github.com/stretchr/testify/assert"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
)

‎controllers/datasource_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ import (
2424

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

27-
"github.com/grafana-operator/grafana-operator/controllers/metrics"
27+
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
2828

2929
"github.com/go-logr/logr"
30-
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
30+
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
3131
gapi "github.com/grafana/grafana-api-golang-client"
3232
"k8s.io/apimachinery/pkg/api/errors"
3333
"k8s.io/apimachinery/pkg/runtime"
3434
ctrl "sigs.k8s.io/controller-runtime"
3535
"sigs.k8s.io/controller-runtime/pkg/client"
3636
"sigs.k8s.io/controller-runtime/pkg/log"
3737

38-
v1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
38+
v1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
3939
)
4040

4141
// GrafanaDatasourceReconciler reconciles a GrafanaDatasource object

‎controllers/fetchers/jsonnet_fetcher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync"
1010

1111
"github.com/google/go-jsonnet"
12-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
12+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
1313
)
1414

1515
// EmbedFSImporter "imports" data from an in-memory embedFS.

‎controllers/fetchers/jsonnet_fetcher_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"reflect"
99
"testing"
1010

11-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
12-
"github.com/grafana-operator/grafana-operator/embeds"
11+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
12+
"github.com/grafana-operator/grafana-operator/v5/embeds"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414
)
1515

‎controllers/fetchers/url_fetcher.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"net/url"
88
"time"
99

10-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
11-
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
12-
"github.com/grafana-operator/grafana-operator/controllers/metrics"
10+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
11+
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
12+
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
1313

1414
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
)

‎controllers/fetchers/url_fetcher_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/http/httptest"
66
"testing"
77

8-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
8+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
99
"github.com/stretchr/testify/assert"
1010
)
1111

‎controllers/grafana_controller.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"time"
2323

2424
"github.com/go-logr/logr"
25-
"github.com/grafana-operator/grafana-operator/controllers/metrics"
26-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
27-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers/grafana"
25+
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
26+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
27+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers/grafana"
2828
v1 "k8s.io/api/apps/v1"
2929
v12 "k8s.io/api/core/v1"
3030
"k8s.io/apimachinery/pkg/api/errors"
@@ -35,7 +35,7 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/client"
3636
"sigs.k8s.io/controller-runtime/pkg/log"
3737

38-
grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
38+
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
3939
)
4040

4141
const (

‎controllers/grafanafolder_controller.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ import (
2424
"time"
2525

2626
"github.com/go-logr/logr"
27-
client2 "github.com/grafana-operator/grafana-operator/controllers/client"
28-
"github.com/grafana-operator/grafana-operator/controllers/metrics"
27+
client2 "github.com/grafana-operator/grafana-operator/v5/controllers/client"
28+
"github.com/grafana-operator/grafana-operator/v5/controllers/metrics"
2929
grapi "github.com/grafana/grafana-api-golang-client"
3030
"k8s.io/apimachinery/pkg/api/errors"
3131

32-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
32+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
3333
"k8s.io/apimachinery/pkg/runtime"
3434
ctrl "sigs.k8s.io/controller-runtime"
3535
"sigs.k8s.io/controller-runtime/pkg/client"
3636
"sigs.k8s.io/controller-runtime/pkg/log"
3737

38-
grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
38+
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
3939
)
4040

4141
// GrafanaFolderReconciler reconciles a GrafanaFolder object

‎controllers/model/dashboard_resources.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package model
33
import (
44
"fmt"
55

6-
grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
6+
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
77
v1 "k8s.io/api/core/v1"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
"k8s.io/apimachinery/pkg/runtime"

‎controllers/model/grafana_resources.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package model
33
import (
44
"fmt"
55

6-
grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
6+
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
77
routev1 "github.com/openshift/api/route/v1"
88
v13 "k8s.io/api/apps/v1"
99
v1 "k8s.io/api/core/v1"

‎controllers/reconcilers/grafana/admin_secret_reconciler.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"os"
66

7-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
8-
"github.com/grafana-operator/grafana-operator/controllers/config"
9-
"github.com/grafana-operator/grafana-operator/controllers/model"
10-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
7+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
8+
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
10+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
1111
v1 "k8s.io/api/core/v1"
1212
"k8s.io/apimachinery/pkg/runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/reconcilers/grafana/complete_reconciler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package grafana
33
import (
44
"context"
55

6-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
7-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
6+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
7+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
88
"k8s.io/apimachinery/pkg/runtime"
99
"sigs.k8s.io/controller-runtime/pkg/log"
1010
)

‎controllers/reconcilers/grafana/config_reconciler.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package grafana
33
import (
44
"context"
55

6-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
7-
"github.com/grafana-operator/grafana-operator/controllers/config"
8-
"github.com/grafana-operator/grafana-operator/controllers/model"
9-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
6+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
7+
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
8+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
1010
"k8s.io/apimachinery/pkg/runtime"
1111
"sigs.k8s.io/controller-runtime/pkg/client"
1212
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

‎controllers/reconcilers/grafana/deployment_reconciler.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
8-
config2 "github.com/grafana-operator/grafana-operator/controllers/config"
9-
"github.com/grafana-operator/grafana-operator/controllers/model"
10-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
7+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
8+
config2 "github.com/grafana-operator/grafana-operator/v5/controllers/config"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
10+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
1111
v12 "k8s.io/api/apps/v1"
1212
v1 "k8s.io/api/core/v1"
1313
"k8s.io/apimachinery/pkg/api/resource"

‎controllers/reconcilers/grafana/grafana_service_reconciler.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"fmt"
66
"strconv"
77

8-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
9-
"github.com/grafana-operator/grafana-operator/controllers/config"
10-
"github.com/grafana-operator/grafana-operator/controllers/model"
11-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
8+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
10+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
11+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
1212
v1 "k8s.io/api/core/v1"
1313
"k8s.io/apimachinery/pkg/runtime"
1414
"k8s.io/apimachinery/pkg/util/intstr"

‎controllers/reconcilers/grafana/grafana_service_reconciler_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package grafana
33
import (
44
"testing"
55

6-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
7-
"github.com/grafana-operator/grafana-operator/controllers/config"
6+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
7+
"github.com/grafana-operator/grafana-operator/v5/controllers/config"
88
"github.com/stretchr/testify/assert"
99
)
1010

‎controllers/reconcilers/grafana/ingress_reconciler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
8-
"github.com/grafana-operator/grafana-operator/controllers/model"
9-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
7+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
8+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
1010
routev1 "github.com/openshift/api/route/v1"
1111
v1 "k8s.io/api/networking/v1"
1212
"k8s.io/apimachinery/pkg/runtime"

‎controllers/reconcilers/grafana/plugins_reconciler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"encoding/json"
66

7-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
8-
"github.com/grafana-operator/grafana-operator/controllers/model"
9-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
7+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
8+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
9+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
1010
"k8s.io/apimachinery/pkg/api/errors"
1111
"k8s.io/apimachinery/pkg/runtime"
1212
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/reconcilers/grafana/pvc_reconciler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package grafana
33
import (
44
"context"
55

6-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
7-
"github.com/grafana-operator/grafana-operator/controllers/model"
8-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
6+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
7+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
8+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
99
"k8s.io/apimachinery/pkg/runtime"
1010
"sigs.k8s.io/controller-runtime/pkg/client"
1111
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

‎controllers/reconcilers/grafana/service_account_reconciler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package grafana
33
import (
44
"context"
55

6-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
7-
"github.com/grafana-operator/grafana-operator/controllers/model"
8-
"github.com/grafana-operator/grafana-operator/controllers/reconcilers"
6+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
7+
"github.com/grafana-operator/grafana-operator/v5/controllers/model"
8+
"github.com/grafana-operator/grafana-operator/v5/controllers/reconcilers"
99
"k8s.io/apimachinery/pkg/runtime"
1010
"sigs.k8s.io/controller-runtime/pkg/client"
1111
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

‎controllers/reconcilers/reconciler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package reconcilers
33
import (
44
"context"
55

6-
"github.com/grafana-operator/grafana-operator/api/v1beta1"
6+
"github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
77
"k8s.io/apimachinery/pkg/runtime"
88
)
99

‎controllers/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
logf "sigs.k8s.io/controller-runtime/pkg/log"
3131
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3232

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

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/grafana-operator/grafana-operator
1+
module github.com/grafana-operator/grafana-operator/v5
22

33
go 1.19
44

‎main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ import (
4141
"sigs.k8s.io/controller-runtime/pkg/healthz"
4242
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4343

44-
grafanav1beta1 "github.com/grafana-operator/grafana-operator/api/v1beta1"
45-
"github.com/grafana-operator/grafana-operator/controllers"
46-
"github.com/grafana-operator/grafana-operator/controllers/autodetect"
44+
grafanav1beta1 "github.com/grafana-operator/grafana-operator/v5/api/v1beta1"
45+
"github.com/grafana-operator/grafana-operator/v5/controllers"
46+
"github.com/grafana-operator/grafana-operator/v5/controllers/autodetect"
4747
//+kubebuilder:scaffold:imports
4848
)
4949

0 commit comments

Comments
 (0)