Skip to content

Commit

Permalink
Update imports (Azure#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
helayoty authored May 25, 2022
1 parent a003578 commit 5b364e8
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions PROJECT
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
domain: azure.com
repo: github.com/Azure/fleet
repo: go.goms.io/fleet
resources:
- api:
crdVersion: v1
controller: true
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
Expand All @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions cmd/hubagent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/memberagent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pkg/configprovider/config_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/hubinternalmembercluster/hub_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/membercluster/membercluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/membership/membership_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5b364e8

Please sign in to comment.