Skip to content

Commit 425b9f0

Browse files
dkoshkindkoshkin
committed
build: move external APIs under /api
The goal is to remove dependency on the common/ package from /api
1 parent 830fb26 commit 425b9f0

File tree

60 files changed

+36
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+36
-33
lines changed

‎.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
name: apis-sync
2727
entry: make apis.sync
2828
language: system
29-
files: "^(hack/third-party/|common/pkg/external/|make/apis.mk$)"
29+
files: "^(hack/third-party/|api/external/|make/apis.mk$)"
3030
pass_filenames: false
3131
- id: addons-sync
3232
name: addons-sync
@@ -106,7 +106,7 @@ repos:
106106
name: License headers - Go
107107
stages: [commit]
108108
files: "(.*\\.go|go.mod)$"
109-
exclude: ^common/pkg/external/
109+
exclude: ^api/external/
110110
args:
111111
- --license-filepath
112112
- hack/license-header.txt

‎common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/condition_consts.go renamed to ‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/condition_consts.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/groupversion_info.go renamed to ‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/groupversion_info.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmchartproxy_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmchartproxy_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmreleaseproxy_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmreleaseproxy_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go renamed to ‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awscluster_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awscluster_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsclustertemplate_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsclustertemplate_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsidentity_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsidentity_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachine_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachine_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachinetemplate_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmachinetemplate_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmanagedcluster_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/awsmanagedcluster_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/bastion.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/bastion.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conditions_consts.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conversion.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/conversion.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/defaults.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/defaults.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/doc.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/doc.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/groupversion_info.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/groupversion_info.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/network_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/tags.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/tags.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go renamed to ‎api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2/zz_generated.defaults.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/condition_consts.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/condition_consts.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/conversion.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/conversion.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/doc.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/doc.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockercluster_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockercluster_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachine_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachine_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/groupversion_info.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/groupversion_info.go

File renamed without changes.

‎common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go renamed to ‎api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go

File renamed without changes.

‎api/go.mod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ module github.com/d2iq-labs/capi-runtime-extensions/api
55

66
go 1.21
77

8-
replace github.com/d2iq-labs/capi-runtime-extensions/common => ../common
9-
108
require (
11-
github.com/d2iq-labs/capi-runtime-extensions/common v0.0.0-00010101000000-000000000000
129
github.com/onsi/gomega v1.31.1
1310
k8s.io/api v0.29.1
1411
k8s.io/apiextensions-apiserver v0.29.1

‎api/v1alpha1/aws_clusterconfig_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package v1alpha1
66
import (
77
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
88

9+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
910
"github.com/d2iq-labs/capi-runtime-extensions/api/variables"
10-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1111
)
1212

1313
type AWSSpec struct {

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/manager"
2525
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2626

27+
caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
2728
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
28-
caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
2929
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/server"
3030
awsclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/clusterconfig"
3131
awsmutation "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/mutation"

‎common/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ module github.com/d2iq-labs/capi-runtime-extensions/common
55

66
go 1.21
77

8+
replace github.com/d2iq-labs/capi-runtime-extensions/api => ../api
9+
810
require (
11+
github.com/d2iq-labs/capi-runtime-extensions/api v0.0.0-00010101000000-000000000000
912
github.com/evanphx/json-patch/v5 v5.8.1
1013
github.com/go-logr/logr v1.4.1
1114
github.com/onsi/gomega v1.31.1

‎common/pkg/capi/apis/schemes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
1111
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
1212

13-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
14-
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
13+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
14+
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
1515
)
1616

1717
func NewScheme(registerFuncs ...func(*runtime.Scheme) error) *runtime.Scheme {

‎common/pkg/testutils/capitest/request/items.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
1515
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1616

17-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
18-
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
17+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
18+
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
1919
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/serializer"
2020
)
2121

‎make/apis.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apis.sync: $(addprefix api.sync.,capa capd caaph) go-fix.common
2222
.PHONY: api.sync.%
2323
api.sync.%: ## Syncs an infrastructure provider's API
2424
api.sync.%: PROVIDER_MODULE_DIR=$(REPO_ROOT)/hack/third-party/$*
25-
api.sync.%: PROVIDER_API_DIR=common/pkg/external/$(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*)/
25+
api.sync.%: PROVIDER_API_DIR=api/external/$(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*)/
2626
api.sync.%: ; $(info $(M) syncing external API: $(PROVIDER_MODULE_$*)/$(PROVIDER_API_PATH_$*)/$(PROVIDER_API_VERSION_$*))
2727
cd $(PROVIDER_MODULE_DIR) && go mod tidy
2828
mkdir -p $(PROVIDER_API_DIR)

‎pkg/handlers/aws/mutation/ami/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
ctrl "sigs.k8s.io/controller-runtime"
1414
"sigs.k8s.io/controller-runtime/pkg/client"
1515

16+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1617
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
)
2121

2222
const (

‎pkg/handlers/aws/mutation/ami/inject_control_plane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package ami
55

66
import (
7+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
78
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
89
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
9-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1010
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
1111
)
1212

‎pkg/handlers/aws/mutation/ami/inject_worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
package ami
44

55
import (
6+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
67
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
78
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
8-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
99
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
1010
)
1111

‎pkg/handlers/aws/mutation/cni/calico/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
ctrl "sigs.k8s.io/controller-runtime"
1515
"sigs.k8s.io/controller-runtime/pkg/client"
1616

17+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1718
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1920
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
2021
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
21-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2222
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
2323
)
2424

‎pkg/handlers/aws/mutation/cni/calico/tests/generate_patches.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/onsi/gomega/format"
1111
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1212

13+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1314
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1415
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
15-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1616
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
1717
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
1818
)

‎pkg/handlers/aws/mutation/controlplaneloadbalancer/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1516
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1617
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
2121
)
2222

‎pkg/handlers/aws/mutation/controlplaneloadbalancer/tests/generate_patches.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/onsi/gomega"
1010
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1111

12+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1213
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1314
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
14-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1515
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
1616
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest/request"
1717
)

‎pkg/handlers/aws/mutation/controlplaneloadbalancer/variables_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"k8s.io/utils/ptr"
1010

11+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1112
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
12-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1313
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest"
1414
awsclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/aws/clusterconfig"
1515
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"

‎pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1516
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1617
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
2121
)
2222

‎pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1516
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1617
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
2121
)
2222

‎pkg/handlers/aws/mutation/instancetype/inject_control_plane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1516
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1617
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
2121
)
2222

‎pkg/handlers/aws/mutation/instancetype/inject_worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1516
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1617
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
2121
)
2222

‎pkg/handlers/aws/mutation/network/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1516
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1617
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
2121
)
2222

‎pkg/handlers/aws/mutation/region/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

15+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1516
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1617
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
2121
)
2222

‎pkg/handlers/aws/mutation/securitygroups/inject.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
ctrl "sigs.k8s.io/controller-runtime"
1414
"sigs.k8s.io/controller-runtime/pkg/client"
1515

16+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1617
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1718
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
19-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2020
)
2121

2222
const (

‎pkg/handlers/aws/mutation/securitygroups/inject_control_plane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package securitygroups
55

66
import (
7+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
78
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
89
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
9-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1010
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
1111
)
1212

‎pkg/handlers/aws/mutation/securitygroups/inject_worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
package securitygroups
44

55
import (
6+
capav1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
67
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
78
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
8-
capav1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
99
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
1010
)
1111

‎pkg/handlers/docker/mutation/customimage/inject_control_plane.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
ctrl "sigs.k8s.io/controller-runtime"
1515
"sigs.k8s.io/controller-runtime/pkg/client"
1616

17+
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
1718
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1920
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
2021
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
21-
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
2222
dockerclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/clusterconfig"
2323
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
2424
)

‎pkg/handlers/docker/mutation/customimage/inject_worker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
ctrl "sigs.k8s.io/controller-runtime"
1515
"sigs.k8s.io/controller-runtime/pkg/client"
1616

17+
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
1718
"github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1"
1819
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches"
1920
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors"
2021
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables"
21-
capdv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
2222
dockerworkerconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/docker/workerconfig"
2323
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig"
2424
)

‎pkg/handlers/generic/lifecycle/cni/calico/strategy_helmaddon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
1717
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1818

19-
caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
19+
caaphv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
2020
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client"
2121
)
2222

0 commit comments

Comments
 (0)