build: move external APIs under /api

The goal is to remove dependency on the common/ package from /api
nutanix-cloud-native · Feb 6, 2024 · 040ae24 · 040ae24
1 parent d330a7a
commit 040ae24
Show file tree

Hide file tree

Showing 60 changed files with 36 additions and 33 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
     name: apis-sync
     entry: make apis.sync
     language: system
-    files: "^(hack/third-party/|common/pkg/external/|make/apis.mk$)"
+    files: "^(hack/third-party/|api/external/|make/apis.mk$)"
     pass_filenames: false
   - id: addons-sync
     name: addons-sync
@@ -106,7 +106,7 @@ repos:
     name: License headers - Go
     stages: [commit]
     files: "(.*\\.go|go.mod)$"
-    exclude: ^common/pkg/external/
+    exclude: ^api/external/
     args:
       - --license-filepath
       - hack/license-header.txt

diff --git a/...der-helm/api/v1alpha1/condition_consts.go → ...der-helm/api/v1alpha1/condition_consts.go b/...der-helm/api/v1alpha1/condition_consts.go → ...der-helm/api/v1alpha1/condition_consts.go
diff --git a/...er-helm/api/v1alpha1/groupversion_info.go → ...er-helm/api/v1alpha1/groupversion_info.go b/...er-helm/api/v1alpha1/groupversion_info.go → ...er-helm/api/v1alpha1/groupversion_info.go
diff --git a/...helm/api/v1alpha1/helmchartproxy_types.go → ...helm/api/v1alpha1/helmchartproxy_types.go b/...helm/api/v1alpha1/helmchartproxy_types.go → ...helm/api/v1alpha1/helmchartproxy_types.go
diff --git a/...lm/api/v1alpha1/helmreleaseproxy_types.go → ...lm/api/v1alpha1/helmreleaseproxy_types.go b/...lm/api/v1alpha1/helmreleaseproxy_types.go → ...lm/api/v1alpha1/helmreleaseproxy_types.go
diff --git a/...elm/api/v1alpha1/zz_generated.deepcopy.go → ...elm/api/v1alpha1/zz_generated.deepcopy.go b/...elm/api/v1alpha1/zz_generated.deepcopy.go → ...elm/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/...er-aws/v2/api/v1beta2/awscluster_types.go → ...er-aws/v2/api/v1beta2/awscluster_types.go b/...er-aws/v2/api/v1beta2/awscluster_types.go → ...er-aws/v2/api/v1beta2/awscluster_types.go
diff --git a/...2/api/v1beta2/awsclustertemplate_types.go → ...2/api/v1beta2/awsclustertemplate_types.go b/...2/api/v1beta2/awsclustertemplate_types.go → ...2/api/v1beta2/awsclustertemplate_types.go
diff --git a/...r-aws/v2/api/v1beta2/awsidentity_types.go → ...r-aws/v2/api/v1beta2/awsidentity_types.go b/...r-aws/v2/api/v1beta2/awsidentity_types.go → ...r-aws/v2/api/v1beta2/awsidentity_types.go
diff --git a/...er-aws/v2/api/v1beta2/awsmachine_types.go → ...er-aws/v2/api/v1beta2/awsmachine_types.go b/...er-aws/v2/api/v1beta2/awsmachine_types.go → ...er-aws/v2/api/v1beta2/awsmachine_types.go
diff --git a/...2/api/v1beta2/awsmachinetemplate_types.go → ...2/api/v1beta2/awsmachinetemplate_types.go b/...2/api/v1beta2/awsmachinetemplate_types.go → ...2/api/v1beta2/awsmachinetemplate_types.go
diff --git a/...v2/api/v1beta2/awsmanagedcluster_types.go → ...v2/api/v1beta2/awsmanagedcluster_types.go b/...v2/api/v1beta2/awsmanagedcluster_types.go → ...v2/api/v1beta2/awsmanagedcluster_types.go
diff --git a/...pi-provider-aws/v2/api/v1beta2/bastion.go → ...pi-provider-aws/v2/api/v1beta2/bastion.go b/...pi-provider-aws/v2/api/v1beta2/bastion.go → ...pi-provider-aws/v2/api/v1beta2/bastion.go
diff --git a/...r-aws/v2/api/v1beta2/conditions_consts.go → ...r-aws/v2/api/v1beta2/conditions_consts.go b/...r-aws/v2/api/v1beta2/conditions_consts.go → ...r-aws/v2/api/v1beta2/conditions_consts.go
diff --git a/...provider-aws/v2/api/v1beta2/conversion.go → ...provider-aws/v2/api/v1beta2/conversion.go b/...provider-aws/v2/api/v1beta2/conversion.go → ...provider-aws/v2/api/v1beta2/conversion.go
diff --git a/...i-provider-aws/v2/api/v1beta2/defaults.go → ...i-provider-aws/v2/api/v1beta2/defaults.go b/...i-provider-aws/v2/api/v1beta2/defaults.go → ...i-provider-aws/v2/api/v1beta2/defaults.go
diff --git a/...er-api-provider-aws/v2/api/v1beta2/doc.go → ...er-api-provider-aws/v2/api/v1beta2/doc.go b/...er-api-provider-aws/v2/api/v1beta2/doc.go → ...er-api-provider-aws/v2/api/v1beta2/doc.go
diff --git a/...r-aws/v2/api/v1beta2/groupversion_info.go → ...r-aws/v2/api/v1beta2/groupversion_info.go b/...r-aws/v2/api/v1beta2/groupversion_info.go → ...r-aws/v2/api/v1beta2/groupversion_info.go
diff --git a/...vider-aws/v2/api/v1beta2/network_types.go → ...vider-aws/v2/api/v1beta2/network_types.go b/...vider-aws/v2/api/v1beta2/network_types.go → ...vider-aws/v2/api/v1beta2/network_types.go
diff --git a/...r-api-provider-aws/v2/api/v1beta2/tags.go → ...r-api-provider-aws/v2/api/v1beta2/tags.go b/...r-api-provider-aws/v2/api/v1beta2/tags.go → ...r-api-provider-aws/v2/api/v1beta2/tags.go
diff --git a/...-api-provider-aws/v2/api/v1beta2/types.go → ...-api-provider-aws/v2/api/v1beta2/types.go b/...-api-provider-aws/v2/api/v1beta2/types.go → ...-api-provider-aws/v2/api/v1beta2/types.go
diff --git a/...s/v2/api/v1beta2/zz_generated.deepcopy.go → ...s/v2/api/v1beta2/zz_generated.deepcopy.go b/...s/v2/api/v1beta2/zz_generated.deepcopy.go → ...s/v2/api/v1beta2/zz_generated.deepcopy.go
diff --git a/...s/v2/api/v1beta2/zz_generated.defaults.go → ...s/v2/api/v1beta2/zz_generated.defaults.go b/...s/v2/api/v1beta2/zz_generated.defaults.go → ...s/v2/api/v1beta2/zz_generated.defaults.go
diff --git a/...re/docker/api/v1beta1/condition_consts.go → ...re/docker/api/v1beta1/condition_consts.go b/...re/docker/api/v1beta1/condition_consts.go → ...re/docker/api/v1beta1/condition_consts.go
diff --git a/...tructure/docker/api/v1beta1/conversion.go → ...tructure/docker/api/v1beta1/conversion.go b/...tructure/docker/api/v1beta1/conversion.go → ...tructure/docker/api/v1beta1/conversion.go
diff --git a/.../infrastructure/docker/api/v1beta1/doc.go → .../infrastructure/docker/api/v1beta1/doc.go b/.../infrastructure/docker/api/v1beta1/doc.go → .../infrastructure/docker/api/v1beta1/doc.go
diff --git a/...docker/api/v1beta1/dockercluster_types.go → ...docker/api/v1beta1/dockercluster_types.go b/...docker/api/v1beta1/dockercluster_types.go → ...docker/api/v1beta1/dockercluster_types.go
diff --git a/...pi/v1beta1/dockerclustertemplate_types.go → ...pi/v1beta1/dockerclustertemplate_types.go b/...pi/v1beta1/dockerclustertemplate_types.go → ...pi/v1beta1/dockerclustertemplate_types.go
diff --git a/...docker/api/v1beta1/dockermachine_types.go → ...docker/api/v1beta1/dockermachine_types.go b/...docker/api/v1beta1/dockermachine_types.go → ...docker/api/v1beta1/dockermachine_types.go
diff --git a/...pi/v1beta1/dockermachinetemplate_types.go → ...pi/v1beta1/dockermachinetemplate_types.go b/...pi/v1beta1/dockermachinetemplate_types.go → ...pi/v1beta1/dockermachinetemplate_types.go
diff --git a/...e/docker/api/v1beta1/groupversion_info.go → ...e/docker/api/v1beta1/groupversion_info.go b/...e/docker/api/v1beta1/groupversion_info.go → ...e/docker/api/v1beta1/groupversion_info.go
diff --git a/...cker/api/v1beta1/zz_generated.deepcopy.go → ...cker/api/v1beta1/zz_generated.deepcopy.go b/...cker/api/v1beta1/zz_generated.deepcopy.go → ...cker/api/v1beta1/zz_generated.deepcopy.go
diff --git a/api/go.mod b/api/go.mod
@@ -5,10 +5,7 @@ module github.com/d2iq-labs/capi-runtime-extensions/api
 
 go 1.21
 
-replace github.com/d2iq-labs/capi-runtime-extensions/common => ../common
-
 require (
-	github.com/d2iq-labs/capi-runtime-extensions/common v0.0.0-00010101000000-000000000000
 	github.com/onsi/gomega v1.31.1
 	k8s.io/api v0.29.1
 	k8s.io/apiextensions-apiserver v0.29.1

diff --git a/api/v1alpha1/aws_clusterconfig_types.go b/api/v1alpha1/aws_clusterconfig_types.go
@@ -6,8 +6,8 @@ package v1alpha1
 import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 )
 
 type AWSSpec struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/main.go b/cmd/main.go
@@ -24,8 +24,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
+	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
-	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/server"
 	awsclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/clusterconfig"
 	awsmutation "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/mutation"

diff --git a/common/go.mod b/common/go.mod
@@ -5,7 +5,10 @@ module github.com/d2iq-labs/capi-runtime-extensions/common
 
 go 1.21
 
+replace github.com/d2iq-labs/capi-runtime-extensions/api => ../api
+
 require (
+	github.com/d2iq-labs/capi-runtime-extensions/api v0.0.0-00010101000000-000000000000
 	github.com/evanphx/json-patch/v5 v5.9.0
 	github.com/go-logr/logr v1.4.1
 	github.com/onsi/gomega v1.31.1

diff --git a/common/pkg/capi/apis/schemes.go b/common/pkg/capi/apis/schemes.go
@@ -10,8 +10,8 @@ import (
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 )
 
 func NewScheme(registerFuncs ...func(*runtime.Scheme) error) *runtime.Scheme {

diff --git a/common/pkg/testutils/capitest/request/items.go b/common/pkg/testutils/capitest/request/items.go
@@ -14,8 +14,8 @@ import (
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/serializer"
 )
 

diff --git a/make/apis.mk b/make/apis.mk
@@ -22,7 +22,7 @@ apis.sync: $(addprefix api.sync.,capa capd caaph) go-fix.common
 .PHONY: api.sync.%
 api.sync.%: ## Syncs an infrastructure provider's API
 api.sync.%: PROVIDER_MODULE_DIR=$(REPO_ROOT)/hack/third-party/$*
-api.sync.%: PROVIDER_API_DIR=common/pkg/external/$(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*)/
+api.sync.%: PROVIDER_API_DIR=api/external/$(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*)/
 api.sync.%: ; $(info $(M) syncing external API: $(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*))
 	cd $(PROVIDER_MODULE_DIR) && go mod tidy
 	mkdir -p $(PROVIDER_API_DIR)

diff --git a/pkg/handlers/aws/mutation/ami/inject.go b/pkg/handlers/aws/mutation/ami/inject.go
@@ -13,10 +13,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 )
 
 const (

diff --git a/pkg/handlers/aws/mutation/ami/inject_control_plane.go b/pkg/handlers/aws/mutation/ami/inject_control_plane.go
@@ -4,9 +4,9 @@
 package ami
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/ami/inject_worker.go b/pkg/handlers/aws/mutation/ami/inject_worker.go
@@ -3,9 +3,9 @@
 package ami
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/cni/calico/inject.go b/pkg/handlers/aws/mutation/cni/calico/inject.go
@@ -14,11 +14,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/cni/calico/tests/generate_patches.go b/pkg/handlers/aws/mutation/cni/calico/tests/generate_patches.go
@@ -10,9 +10,9 @@ import (
 	"github.com/onsi/gomega/format"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
 )

diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/tests/generate_patches.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/tests/generate_patches.go
@@ -9,9 +9,9 @@ import (
 	"github.com/onsi/gomega"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
 )

diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go
@@ -8,8 +8,8 @@ import (
 
 	"k8s.io/utils/ptr"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
 	awsclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/clusterconfig"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"

diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go b/pkg/handlers/aws/mutation/instancetype/inject_control_plane.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/instancetype/inject_worker.go b/pkg/handlers/aws/mutation/instancetype/inject_worker.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/network/inject.go b/pkg/handlers/aws/mutation/network/inject.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/region/inject.go b/pkg/handlers/aws/mutation/region/inject.go
@@ -12,11 +12,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/securitygroups/inject.go b/pkg/handlers/aws/mutation/securitygroups/inject.go
@@ -13,10 +13,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 )
 
 const (

diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go
@@ -4,9 +4,9 @@
 package securitygroups
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )
 

diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_worker.go b/pkg/handlers/aws/mutation/securitygroups/inject_worker.go
@@ -3,9 +3,9 @@
 package securitygroups
 
 import (
+	capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
-	capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )
 

diff --git a/pkg/handlers/docker/mutation/customimage/inject_control_plane.go b/pkg/handlers/docker/mutation/customimage/inject_control_plane.go
@@ -14,11 +14,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	dockerclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/clusterconfig"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
 )

diff --git a/pkg/handlers/docker/mutation/customimage/inject_worker.go b/pkg/handlers/docker/mutation/customimage/inject_worker.go
@@ -14,11 +14,11 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
-	capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
 	dockerworkerconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/workerconfig"
 	"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
 )

diff --git a/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go b/pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go
@@ -16,7 +16,7 @@ import (
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
+	caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client"
 )