Skip to content

Commit

Permalink
Merge pull request #7 from dormullor/main
Browse files Browse the repository at this point in the history
Fix go module name
  • Loading branch information
dorroddorrod authored Nov 22, 2022
2 parents 0060ed1 + cc065c7 commit ac8c17b
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ====================================================================================
# Setup Project
PROJECT_NAME := provider-kops
PROJECT_REPO := github.com/crossplane/$(PROJECT_NAME)
PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME)

PLATFORMS ?= linux_amd64 linux_arm64
-include build/makelib/common.mk
Expand Down
1 change: 1 addition & 0 deletions apis/generate.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build generate
// +build generate

/*
Expand Down
4 changes: 2 additions & 2 deletions apis/kops.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package apis
import (
"k8s.io/apimachinery/pkg/runtime"

kops "github.com/crossplane/provider-kops/apis/kops/v1alpha1"
kopsv1alpha1 "github.com/crossplane/provider-kops/apis/v1alpha1"
kops "github.com/crossplane-contrib/provider-kops/apis/kops/v1alpha1"
kopsv1alpha1 "github.com/crossplane-contrib/provider-kops/apis/v1alpha1"
)

func init() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/provider/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/ratelimiter"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/crossplane/provider-kops/apis"
"github.com/crossplane/provider-kops/apis/v1alpha1"
kops "github.com/crossplane/provider-kops/internal/controller"
"github.com/crossplane/provider-kops/internal/controller/features"
"github.com/crossplane-contrib/provider-kops/apis"
"github.com/crossplane-contrib/provider-kops/apis/v1alpha1"
kops "github.com/crossplane-contrib/provider-kops/internal/controller"
"github.com/crossplane-contrib/provider-kops/internal/controller/features"
)

func main() {
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 github.com/crossplane/provider-kops
module github.com/crossplane-contrib/provider-kops

go 1.17

Expand Down
2 changes: 1 addition & 1 deletion internal/controller/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/crossplane/provider-kops/apis/v1alpha1"
"github.com/crossplane-contrib/provider-kops/apis/v1alpha1"
)

// Setup adds a controller that reconciles ProviderConfigs by accounting for
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/kops.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/controller"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/crossplane/provider-kops/internal/controller/config"
"github.com/crossplane/provider-kops/internal/controller/kops"
"github.com/crossplane-contrib/provider-kops/internal/controller/config"
"github.com/crossplane-contrib/provider-kops/internal/controller/kops"
)

// Setup creates all Kops controllers with the supplied logger and adds them to
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/kops/kops.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ import (
"context"
"fmt"

"github.com/crossplane-contrib/provider-kops/apis/kops/v1alpha1"
apisv1alpha1 "github.com/crossplane-contrib/provider-kops/apis/v1alpha1"
"github.com/crossplane-contrib/provider-kops/internal/controller/features"
"github.com/crossplane-contrib/provider-kops/internal/util"
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
"github.com/crossplane/crossplane-runtime/pkg/connection"
"github.com/crossplane/crossplane-runtime/pkg/controller"
Expand All @@ -28,10 +32,6 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/ratelimiter"
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"
"github.com/crossplane/provider-kops/apis/kops/v1alpha1"
apisv1alpha1 "github.com/crossplane/provider-kops/apis/v1alpha1"
"github.com/crossplane/provider-kops/internal/controller/features"
"github.com/crossplane/provider-kops/internal/util"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kopsClient "k8s.io/kops/pkg/client/simple"
Expand Down
2 changes: 1 addition & 1 deletion internal/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"time"

"github.com/crossplane-contrib/provider-kops/apis/kops/v1alpha1"
"github.com/crossplane/crossplane-runtime/pkg/meta"
"github.com/crossplane/provider-kops/apis/kops/v1alpha1"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion package/crossplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: provider-kops
annotations:
meta.crossplane.io/maintainer: Crossplane Maintainers <info@crossplane.io>
meta.crossplane.io/source: github.com/crossplane/provider-kops
meta.crossplane.io/source: github.com/crossplane-contrib/provider-kops
meta.crossplane.io/license: Apache-2.0
meta.crossplane.io/description: |
A kops that can be used to create Crossplane providers.
Expand Down

0 comments on commit ac8c17b

Please sign in to comment.