Skip to content

Commit

Permalink
Merge pull request #537 from meshery/fix/build
Browse files Browse the repository at this point in the history
Fixed build failed
  • Loading branch information
Aisuko authored Oct 22, 2023
2 parents dcc2130 + 0cce3ef commit 6917358
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion controllers/broker_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

mesheryv1alpha1 "github.com/layer5io/meshery-operator/api/v1alpha1"
brokerpackage "github.com/layer5io/meshery-operator/pkg/broker"
"github.com/meshery/meshery-operator/pkg/utils"
"github.com/layer5io/meshery-operator/pkg/utils"
kubeerror "k8s.io/apimachinery/pkg/api/errors"
types "k8s.io/apimachinery/pkg/types"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/meshsync_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
mesheryv1alpha1 "github.com/layer5io/meshery-operator/api/v1alpha1"
brokerpackage "github.com/layer5io/meshery-operator/pkg/broker"
meshsyncpackage "github.com/layer5io/meshery-operator/pkg/meshsync"
"github.com/meshery/meshery-operator/pkg/utils"
"github.com/layer5io/meshery-operator/pkg/utils"
kubeerror "k8s.io/apimachinery/pkg/api/errors"
types "k8s.io/apimachinery/pkg/types"
)
Expand Down
5 changes: 1 addition & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ module github.com/layer5io/meshery-operator

go 1.21

toolchain go1.21.2

replace (
github.com/meshery/meshery-operator => ../meshery-operator
k8s.io/api => k8s.io/api v0.25.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3
k8s.io/apimachinery => k8s.io/apimachinery v0.25.3
Expand All @@ -16,7 +13,6 @@ replace (

require (
github.com/go-logr/logr v1.2.4
github.com/meshery/meshery-operator v0.0.0-00010101000000-000000000000
github.com/onsi/ginkgo/v2 v2.6.0
github.com/onsi/gomega v1.24.1
k8s.io/api v0.26.1
Expand Down Expand Up @@ -60,6 +56,7 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion pkg/broker/broker.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
neturl "net/url"

mesheryv1alpha1 "github.com/layer5io/meshery-operator/api/v1alpha1"
utils "github.com/meshery/meshery-operator/pkg/utils"
utils "github.com/layer5io/meshery-operator/pkg/utils"
v1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down

0 comments on commit 6917358

Please sign in to comment.