From 0cce3ef62bfcbdd3e4d41f48ac7ded7d5403a59f Mon Sep 17 00:00:00 2001 From: Aisuko Date: Sun, 22 Oct 2023 00:17:59 +0000 Subject: [PATCH] Fixed build failed Signed-off-by: GitHub --- controllers/broker_controller.go | 2 +- controllers/meshsync_controller.go | 2 +- go.mod | 5 +---- pkg/broker/broker.go | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/controllers/broker_controller.go b/controllers/broker_controller.go index 1f8f094..8532db3 100644 --- a/controllers/broker_controller.go +++ b/controllers/broker_controller.go @@ -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" ) diff --git a/controllers/meshsync_controller.go b/controllers/meshsync_controller.go index bdafc98..00a7ccb 100644 --- a/controllers/meshsync_controller.go +++ b/controllers/meshsync_controller.go @@ -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" ) diff --git a/go.mod b/go.mod index 791fed2..b5335f9 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -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 @@ -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 diff --git a/pkg/broker/broker.go b/pkg/broker/broker.go index f5bb7bd..b65ac5e 100644 --- a/pkg/broker/broker.go +++ b/pkg/broker/broker.go @@ -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"