diff --git a/Makefile b/Makefile index 34c6b5824..d63318c42 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,7 @@ staticcheck: $(STATICCHECK) .PHONY: fmt fmt: $(GOIMPORTS) ## Run go fmt against code. go fmt ./... - $(GOIMPORTS) -local github.com/Azure/fleet -w $$(go list -f {{.Dir}} ./...) + $(GOIMPORTS) -local go.goms.io/fleet -w $$(go list -f {{.Dir}} ./...) .PHONY: vet vet: ## Run go vet against code. diff --git a/PROJECT b/PROJECT index 5d6858e35..adfe37dc5 100644 --- a/PROJECT +++ b/PROJECT @@ -1,5 +1,5 @@ domain: azure.com -repo: github.com/Azure/fleet +repo: go.goms.io/fleet resources: - api: crdVersion: v1 @@ -7,7 +7,7 @@ resources: domain: azure.com group: fleet kind: MemberCluster - path: github.com/Azure/fleet/apis/v1alpha1 + path: go.goms.io/fleet/apis/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -16,7 +16,7 @@ resources: domain: azure.com group: fleet kind: Membership - path: github.com/Azure/fleet/apis/v1alpha1 + path: go.goms.io/fleet/apis/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -25,6 +25,6 @@ resources: domain: azure.com group: fleet kind: InternalMemberCluster - path: github.com/Azure/fleet/apis/v1alpha1 + path: go.goms.io/fleet/apis/v1alpha1 version: v1alpha1 version: "3" diff --git a/README.md b/README.md index 2a0197054..304374757 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Fleet ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Azure/fleet) -[![Go Report Card](https://goreportcard.com/badge/github.com/Azure/fleet)](https://goreportcard.com/report/github.com/Azure/fleet) +[![Go Report Card](https://goreportcard.com/badge/go.goms.io/fleet)](https://goreportcard.com/report/go.goms.io/fleet) ![Build Status](https://github.com//Azure/fleet/actions/workflows/workflow.yml/badge.svg) ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/Azure/fleet) [![codecov](https://codecov.io/gh/Azure/fleet/branch/main/graph/badge.svg?token=D3mtbzACjC)](https://codecov.io/gh/Azure/fleet) diff --git a/cmd/hubagent/main.go b/cmd/hubagent/main.go index 508dd38fc..076cf69d7 100644 --- a/cmd/hubagent/main.go +++ b/cmd/hubagent/main.go @@ -15,9 +15,9 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - fleetv1alpha1 "github.com/Azure/fleet/apis/v1alpha1" - "github.com/Azure/fleet/pkg/controllers/hubinternalmembercluster" - "github.com/Azure/fleet/pkg/controllers/membercluster" + fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1" + "go.goms.io/fleet/pkg/controllers/hubinternalmembercluster" + "go.goms.io/fleet/pkg/controllers/membercluster" //+kubebuilder:scaffold:imports ) diff --git a/cmd/memberagent/main.go b/cmd/memberagent/main.go index b88b827e0..c9c1647a1 100644 --- a/cmd/memberagent/main.go +++ b/cmd/memberagent/main.go @@ -20,9 +20,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/healthz" - fleetv1alpha1 "github.com/Azure/fleet/apis/v1alpha1" - "github.com/Azure/fleet/pkg/controllers/memberinternalmembercluster" - "github.com/Azure/fleet/pkg/controllers/membership" + fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1" + "go.goms.io/fleet/pkg/controllers/memberinternalmembercluster" + "go.goms.io/fleet/pkg/controllers/membership" //+kubebuilder:scaffold:imports ) diff --git a/go.mod b/go.mod index 7933a5cc6..73f0329ad 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.17 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.13.0 - github.com/Azure/fleet v0.0.0-00010101000000-000000000000 github.com/crossplane/crossplane-runtime v0.16.0 github.com/stretchr/testify v1.7.0 k8s.io/apimachinery v0.23.0 @@ -74,7 +73,6 @@ require ( ) replace ( - github.com/Azure/fleet => ./. k8s.io/api => k8s.io/api v0.23.0 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0 k8s.io/apimachinery => k8s.io/apimachinery v0.23.0 diff --git a/pkg/configprovider/config_provider.go b/pkg/configprovider/config_provider.go index c9b55e1fe..65878e7b1 100644 --- a/pkg/configprovider/config_provider.go +++ b/pkg/configprovider/config_provider.go @@ -12,8 +12,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "go.goms.io/fleet/pkg/interfaces" "k8s.io/client-go/rest" + + "go.goms.io/fleet/pkg/interfaces" ) const ( diff --git a/pkg/controllers/hubinternalmembercluster/hub_controller.go b/pkg/controllers/hubinternalmembercluster/hub_controller.go index b31d0b84d..e6d450bd2 100644 --- a/pkg/controllers/hubinternalmembercluster/hub_controller.go +++ b/pkg/controllers/hubinternalmembercluster/hub_controller.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - fleetv1alpha1 "github.com/Azure/fleet/apis/v1alpha1" + fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1" ) // HubReconciler reconciles a InternalMemberCluster object in the hub cluster. diff --git a/pkg/controllers/membercluster/membercluster_controller.go b/pkg/controllers/membercluster/membercluster_controller.go index 13fa3c893..1f574b963 100644 --- a/pkg/controllers/membercluster/membercluster_controller.go +++ b/pkg/controllers/membercluster/membercluster_controller.go @@ -20,8 +20,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - fleetv1alpha1 "github.com/Azure/fleet/apis/v1alpha1" - "github.com/Azure/fleet/pkg/utils" + fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1" + "go.goms.io/fleet/pkg/utils" ) // Reconciler reconciles a MemberCluster object diff --git a/pkg/controllers/membercluster/membercluster_controller_test.go b/pkg/controllers/membercluster/membercluster_controller_test.go index 5be34c70d..9bd890810 100644 --- a/pkg/controllers/membercluster/membercluster_controller_test.go +++ b/pkg/controllers/membercluster/membercluster_controller_test.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/fleet/pkg/utils" + "go.goms.io/fleet/pkg/utils" ) const ( diff --git a/pkg/controllers/memberinternalmembercluster/member_controller.go b/pkg/controllers/memberinternalmembercluster/member_controller.go index df96d9f3e..33fe53cde 100644 --- a/pkg/controllers/memberinternalmembercluster/member_controller.go +++ b/pkg/controllers/memberinternalmembercluster/member_controller.go @@ -15,8 +15,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - fleetv1alpha1 "github.com/Azure/fleet/apis/v1alpha1" - "github.com/Azure/fleet/pkg/utils" + fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1" + "go.goms.io/fleet/pkg/utils" ) // MemberReconciler reconciles a InternalMemberCluster object in the member cluster. diff --git a/pkg/controllers/membership/membership_controller.go b/pkg/controllers/membership/membership_controller.go index 6193a6b70..13bd4b47b 100644 --- a/pkg/controllers/membership/membership_controller.go +++ b/pkg/controllers/membership/membership_controller.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - fleetv1alpha1 "github.com/Azure/fleet/apis/v1alpha1" + fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1" ) // Reconciler reconciles a Membership object