Skip to content

Commit

Permalink
feat: make the module go-gettable
Browse files Browse the repository at this point in the history
This commit changes the module name so that it can be fetched with the
go get command.
  • Loading branch information
fpetkovski committed Nov 29, 2021
1 parent 6cd1087 commit 94342b7
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 18 deletions.
3 changes: 2 additions & 1 deletion cmd/operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ package main
import (
"flag"
"os"
"rhobs/monitoring-stack-operator/pkg/operator"

"github.com/rhobs/monitoring-stack-operator/pkg/operator"

ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module rhobs/monitoring-stack-operator
module github.com/rhobs/monitoring-stack-operator

go 1.17

Expand Down
3 changes: 2 additions & 1 deletion pkg/controllers/grafana-operator/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ package grafana_operator
import (
"context"
"fmt"
"rhobs/monitoring-stack-operator/pkg/eventsource"
"time"

"github.com/rhobs/monitoring-stack-operator/pkg/eventsource"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

networkingv1 "k8s.io/api/networking/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/monitoring-stack/alertmanager.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package monitoringstack

import (
stack "rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"
stack "github.com/rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
Expand Down
5 changes: 3 additions & 2 deletions pkg/controllers/monitoring-stack/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package monitoringstack

import (
"fmt"
stack "rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"
grafana_operator "rhobs/monitoring-stack-operator/pkg/controllers/grafana-operator"

stack "github.com/rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"
grafana_operator "github.com/rhobs/monitoring-stack-operator/pkg/controllers/grafana-operator"

"k8s.io/apimachinery/pkg/util/intstr"

Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/monitoring-stack/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

stack "rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"
stack "github.com/rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"

"github.com/go-logr/logr"
monv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
Expand Down
5 changes: 3 additions & 2 deletions pkg/operator/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package operator
import (
"context"
"fmt"
goctrl "rhobs/monitoring-stack-operator/pkg/controllers/grafana-operator"
stackctrl "rhobs/monitoring-stack-operator/pkg/controllers/monitoring-stack"

goctrl "github.com/rhobs/monitoring-stack-operator/pkg/controllers/grafana-operator"
stackctrl "github.com/rhobs/monitoring-stack-operator/pkg/controllers/monitoring-stack"

"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/scheme.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package operator

import (
rhobsv1alpha1 "rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"
rhobsv1alpha1 "github.com/rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"

integreatlyv1alpha1 "github.com/grafana-operator/grafana-operator/v4/api/integreatly/v1alpha1"
olmv1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/scheme"
Expand Down
7 changes: 4 additions & 3 deletions test/e2e/grafana_operator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package e2e

import (
"context"
grafana_operator "rhobs/monitoring-stack-operator/pkg/controllers/grafana-operator"
"rhobs/monitoring-stack-operator/test/e2e/framework"
fw "rhobs/monitoring-stack-operator/test/e2e/framework"
"testing"
"time"

grafana_operator "github.com/rhobs/monitoring-stack-operator/pkg/controllers/grafana-operator"
"github.com/rhobs/monitoring-stack-operator/test/e2e/framework"
fw "github.com/rhobs/monitoring-stack-operator/test/e2e/framework"

olmv1 "github.com/operator-framework/api/pkg/operators/v1"
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
v1 "k8s.io/api/core/v1"
Expand Down
5 changes: 3 additions & 2 deletions test/e2e/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"flag"
"log"
"os"
"rhobs/monitoring-stack-operator/pkg/operator"
"rhobs/monitoring-stack-operator/test/e2e/framework"
"testing"

"github.com/rhobs/monitoring-stack-operator/pkg/operator"
"github.com/rhobs/monitoring-stack-operator/test/e2e/framework"

"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/config"

Expand Down
5 changes: 3 additions & 2 deletions test/e2e/monitoring_stack_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@ import (
"encoding/json"
"fmt"
"net/http"
"rhobs/monitoring-stack-operator/test/e2e/framework"
"testing"
"time"

"github.com/rhobs/monitoring-stack-operator/test/e2e/framework"

"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

"k8s.io/apimachinery/pkg/util/intstr"

"k8s.io/apimachinery/pkg/util/wait"

stack "rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"
stack "github.com/rhobs/monitoring-stack-operator/pkg/apis/v1alpha1"

monv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"

Expand Down
3 changes: 2 additions & 1 deletion test/e2e/prometheus_operator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package e2e

import (
"context"
"rhobs/monitoring-stack-operator/test/e2e/framework"
"testing"
"time"

"github.com/rhobs/monitoring-stack-operator/test/e2e/framework"

v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
appsv1 "k8s.io/api/apps/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
Expand Down

0 comments on commit 94342b7

Please sign in to comment.