Migrate capc to kubernetes-sigs (#2295)

* Renaming path in imports * Replacing more occurrences * Renaming to use k8s.sigs.io prefix * linting
aws · Jun 3, 2022 · 9a8e1b1 · 9a8e1b1
1 parent 93d1dc8
commit 9a8e1b1
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 65 deletions.
diff --git a/ATTRIBUTION.txt b/ATTRIBUTION.txt
@@ -35,7 +35,7 @@ https://github.com/aws/aws-sdk-go-v2/service/sso
 ** github.com/aws/aws-sdk-go-v2/service/sts; version v1.16.3 --
 https://github.com/aws/aws-sdk-go-v2/service/sts
 
-** github.com/aws/cluster-api-provider-cloudstack; version v0.4.5-0.20220517182938-efac5f45b7af --
+** github.com/kubernetes-sigs/cluster-api-provider-cloudstack; version v0.4.5-rc3 --
 https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack
 
 ** github.com/aws/eks-distro-build-tooling/release/api/v1alpha1; version v0.0.0-20211103003257-a7e2379eae5e --

diff --git a/controllers/controllers/resource/fetcher.go b/controllers/controllers/resource/fetcher.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strings"
 
-	cloudstackv1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
 	eksdv1alpha1 "github.com/aws/eks-distro-build-tooling/release/api/v1alpha1"
 	"github.com/go-logr/logr"
 	etcdv1 "github.com/mrajashree/etcdadm-controller/api/v1beta1"
@@ -16,6 +15,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/apimachinery/pkg/types"
+	cloudstackv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
 	vspherev1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	kubeadmv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"

diff --git a/controllers/controllers/resource/fetcher_test.go b/controllers/controllers/resource/fetcher_test.go
@@ -5,7 +5,6 @@ import (
 	"reflect"
 	"testing"
 
-	cloudstackv1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
 	"github.com/go-logr/logr"
 	"github.com/golang/mock/gomock"
 	etcdv1 "github.com/mrajashree/etcdadm-controller/api/v1beta1"
@@ -14,6 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	cloudstackv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
 	vspherev1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	kubeadmv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"

diff --git a/controllers/main.go b/controllers/main.go
@@ -5,14 +5,14 @@ import (
 	"flag"
 	"os"
 
-	cloudstackv1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
 	eksdv1alpha1 "github.com/aws/eks-distro-build-tooling/release/api/v1alpha1"
 	etcdv1 "github.com/mrajashree/etcdadm-controller/api/v1beta1"
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	cloudstackv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
 	vspherev1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	kubeadmv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"

diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/aws/aws-sdk-go-v2 v1.16.2
 	github.com/aws/aws-sdk-go-v2/config v1.15.3
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.34.0
-	github.com/aws/cluster-api-provider-cloudstack v0.4.5-rc2.0.20220524192516-7918d6e69552
 	github.com/aws/eks-anywhere-packages v0.1.1
 	github.com/aws/eks-anywhere/release v0.0.0-20211130194657-f6e9593c6551
 	github.com/aws/eks-distro-build-tooling/release v0.0.0-20211103003257-a7e2379eae5e
@@ -41,6 +40,7 @@ require (
 	k8s.io/client-go v0.23.1
 	oras.land/oras-go v1.1.0
 	sigs.k8s.io/cluster-api v1.1.3
+	sigs.k8s.io/cluster-api-provider-cloudstack v0.4.5-rc3
 	sigs.k8s.io/cluster-api-provider-vsphere v1.0.1
 	sigs.k8s.io/cluster-api/test v1.0.0
 	sigs.k8s.io/controller-runtime v0.11.1

diff --git a/go.sum b/go.sum
@@ -289,8 +289,6 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.11.3/go.mod h1:7UQ/e69kU7LDPtY40OyoH
 github.com/aws/aws-sdk-go-v2/service/sts v1.6.0/go.mod h1:q7o0j7d7HrJk/vr9uUt3BVRASvcU7gYZB9PUgPiByXg=
 github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 h1:cJGRyzCSVwZC7zZZ1xbx9m32UnrKydRYhOvcD1NYP9Q=
 github.com/aws/aws-sdk-go-v2/service/sts v1.16.3/go.mod h1:bfBj0iVmsUyUg4weDB4NxktD9rDGeKSVWnjTnwbx9b8=
-github.com/aws/cluster-api-provider-cloudstack v0.4.5-rc2.0.20220524192516-7918d6e69552 h1:UNnnGn6vNV4PvQmXMMUzkbLNs5HFWjKALAZ2H0nln5w=
-github.com/aws/cluster-api-provider-cloudstack v0.4.5-rc2.0.20220524192516-7918d6e69552/go.mod h1:fafGBTlbWJKQz5EuGV36U0smcZ4BYPZ0bxCyz1nLdgg=
 github.com/aws/eks-anywhere-packages v0.1.1 h1:miuYyEPS0MAzC/1+v99XPzBILYjs+Jl5CoqC95IAIg8=
 github.com/aws/eks-anywhere-packages v0.1.1/go.mod h1:0rPTMF03bX8YuoaHsGzDANxrwjnL3XcyPg8g6I920Ys=
 github.com/aws/eks-distro-build-tooling/release v0.0.0-20211103003257-a7e2379eae5e h1:GB6Cn9yKEt31mDF7RrVWyM9WoppNkGYth8zBPIJGJ+w=
@@ -2738,6 +2736,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
+sigs.k8s.io/cluster-api-provider-cloudstack v0.4.5-rc3 h1:Ge3aNWoBTfhgUgweecZaMVT24xNx/Y+WeN9OP4exJwA=
+sigs.k8s.io/cluster-api-provider-cloudstack v0.4.5-rc3/go.mod h1:pw63Cikv2KHwjS9VFwlJn2rqf2/bcTnycaX10K7Ti0k=
 sigs.k8s.io/cluster-api-provider-vsphere v1.0.1 h1:qs7zSFkAL9tU8tHob7bmrEWfKsOU5JaskpeSIYrhQCc=
 sigs.k8s.io/cluster-api-provider-vsphere v1.0.1/go.mod h1:Z6MDQcZjX5DUcEFStotBptj2fMR4vgCVPAnw6inIY20=
 sigs.k8s.io/cluster-api/test v1.0.0 h1:PeWOLXtDGYMmzXwGX+NtH7Xxx6BtS83DT7vKzITY5X0=

diff --git a/pkg/api/v1alpha1/thirdparty/tinkerbell/zz_generated.deepcopy.go b/pkg/api/v1alpha1/thirdparty/tinkerbell/zz_generated.deepcopy.go
diff --git a/pkg/executables/kubectl.go b/pkg/executables/kubectl.go
@@ -10,7 +10,6 @@ import (
 	"sort"
 	"strings"
 
-	cloudstackv1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
 	eksdv1alpha1 "github.com/aws/eks-distro-build-tooling/release/api/v1alpha1"
 	etcdv1 "github.com/mrajashree/etcdadm-controller/api/v1beta1"
 	pbnjv1alpha1 "github.com/tinkerbell/cluster-api-provider-tinkerbell/pbnj/api/v1alpha1"
@@ -21,6 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"
+	cloudstackv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
 	vspherev1 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"

diff --git a/release/pkg/assets_capc.go b/release/pkg/assets_capc.go
@@ -24,7 +24,7 @@ import (
 	anywherev1alpha1 "github.com/aws/eks-anywhere/release/api/v1alpha1"
 )
 
-const capcProjectPath = "projects/aws/cluster-api-provider-cloudstack"
+const capcProjectPath = "projects/kubernetes-sigs/cluster-api-provider-cloudstack"
 
 // GetCapcAssets returns the eks-a artifacts for CAPC
 func (r *ReleaseConfig) GetCapcAssets() ([]Artifact, error) {
@@ -34,7 +34,7 @@ func (r *ReleaseConfig) GetCapcAssets() ([]Artifact, error) {
 	}
 
 	name := "cluster-api-cloudstack-controller"
-	repoName := "aws/cluster-api-provider-cloudstack/release/manager"
+	repoName := "kubernetes-sigs/cluster-api-provider-cloudstack/release/manager"
 	tagOptions := map[string]string{
 		"gitTag":      gitTag,
 		"projectPath": capcProjectPath,
@@ -92,7 +92,7 @@ func (r *ReleaseConfig) GetCapcAssets() ([]Artifact, error) {
 		latestPath := getLatestUploadDestination(sourcedFromBranch)
 
 		if r.DevRelease || r.ReleaseEnvironment == "development" {
-			sourceS3Prefix = fmt.Sprintf("projects/aws/cluster-api-provider-cloudstack/%s/manifests/infrastructure-cloudstack/%s", latestPath, gitTag)
+			sourceS3Prefix = fmt.Sprintf("projects/kubernetes-sigs/cluster-api-provider-cloudstack/%s/manifests/infrastructure-cloudstack/%s", latestPath, gitTag)
 		} else {
 			sourceS3Prefix = fmt.Sprintf("releases/bundles/%d/artifacts/cluster-api-provider-cloudstack/manifests/infrastructure-cloudstack/%s", r.BundleNumber, gitTag)
 		}