Skip to content

Commit

Permalink
Merge pull request grafana#568 from vmanley/update-go-mod-to-v4
Browse files Browse the repository at this point in the history 
update go.mod to v4
  • Loading branch information
@pb82
pb82 authored Oct 18, 2021
2 parents c69b65e + ee820b8 commit 525ad64
Show file tree
Hide file tree
Showing 32 changed files with 82 additions and 79 deletions.
2 changes: 1 addition & 1 deletion api/addtoscheme_integreatly_v1alpha1.go
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions controllers/common/auto_detect.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/common/clusterActions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions controllers/common/clusterState.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions controllers/common/dataSourcesState.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/config/controller_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion controllers/config/controller_config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/config/grafanaIni.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion controllers/config/grafanaIni_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/config/notification_controller_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions controllers/grafana/grafana_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions controllers/grafana/grafana_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions controllers/grafana/grafonnet_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/grafana/pluginsHelper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions controllers/grafanadashboard/dashboard_pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/grafanadashboard/grafana_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
10 changes: 5 additions & 5 deletions controllers/grafanadashboard/grafanadashboard_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions controllers/grafanadatasource/datasource_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/grafanadatasource/datasource_pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions controllers/grafananotificationchannel/grafananotificationchannel_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ 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"

"net/http"
"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"
Expand Down
3 changes: 2 additions & 1 deletion controllers/grafananotificationchannel/grafananotificationchannel_pipeline.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
7 changes: 4 additions & 3 deletions controllers/model/adminUserSecret.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions controllers/model/grafanaConfig.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/model/grafanaDataPvc.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions controllers/model/grafanaDatasources.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
7 changes: 3 additions & 4 deletions controllers/model/grafanaDeployment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/model/grafanaIngress.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/model/grafanaRoute.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/model/grafanaService.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/model/grafanaServiceAccount.go
View file
Original file line number Diff line number Diff line change
@@ -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"
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/integr8ly/grafana-operator
module github.com/grafana-operator/grafana-operator/v4

go 1.16

Expand Down
Loading

0 comments on commit 525ad64

Please sign in to comment.