diff --git a/api/go.mod b/api/go.mod index e31cae47e..33081668b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -5,7 +5,7 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/ap go 1.22.0 -toolchain go1.23.3 +toolchain go1.23.5 replace github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common => ../common diff --git a/common/go.mod b/common/go.mod index 3d13fadb2..123b92222 100644 --- a/common/go.mod +++ b/common/go.mod @@ -5,14 +5,11 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/co go 1.22.0 -toolchain go1.23.3 - -replace github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api => ../api +toolchain go1.23.5 require ( github.com/evanphx/json-patch/v5 v5.9.0 github.com/go-logr/logr v1.4.2 - github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api v0.0.0-00010101000000-000000000000 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.0 github.com/samber/lo v1.47.0 @@ -31,7 +28,6 @@ require ( require ( github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -52,7 +48,6 @@ require ( github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect github.com/google/uuid v1.6.0 // indirect github.com/imdario/mergo v0.3.13 // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -60,7 +55,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/nutanix-cloud-native/prism-go-client v0.5.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.18.0 // indirect diff --git a/common/go.sum b/common/go.sum index eac4c9a6a..ffd652d4a 100644 --- a/common/go.sum +++ b/common/go.sum @@ -2,8 +2,6 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= -github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= @@ -72,10 +70,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rH github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -97,8 +91,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nutanix-cloud-native/prism-go-client v0.5.1 h1:ykiXPCILzEMORHz7XvI8KXNomChsdLIpOAlT/YqBCmo= -github.com/nutanix-cloud-native/prism-go-client v0.5.1/go.mod h1:QhLX+sEep0cStzHVYU6mPgIlnA8U3DySskagrbDprRk= github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y= diff --git a/common/pkg/capi/apis/decoders.go b/common/pkg/capi/apis/decoders.go deleted file mode 100644 index 09f4ab795..000000000 --- a/common/pkg/capi/apis/decoders.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2023 Nutanix. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 - -package apis - -import ( - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" -) - -func DecoderForScheme(scheme *runtime.Scheme) runtime.Decoder { - return serializer.NewCodecFactory(scheme).UniversalDecoder( - scheme.PrioritizedVersionsAllGroups()..., - ) -} - -func CAPIDecoder() runtime.Decoder { - return DecoderForScheme(CAPIScheme()) -} - -func CAPDDecoder() runtime.Decoder { - return DecoderForScheme(CAPDScheme()) -} - -func CAPADecoder() runtime.Decoder { - return DecoderForScheme(CAPAScheme()) -} diff --git a/common/pkg/capi/apis/schemes.go b/common/pkg/capi/apis/schemes.go deleted file mode 100644 index d75fe469f..000000000 --- a/common/pkg/capi/apis/schemes.go +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2023 Nutanix. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 - -package apis - -import ( - "k8s.io/apimachinery/pkg/runtime" - utilruntime "k8s.io/apimachinery/pkg/util/runtime" - clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1" - controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" - capdv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" - - capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" -) - -func NewScheme(registerFuncs ...func(*runtime.Scheme) error) *runtime.Scheme { - sb := runtime.NewSchemeBuilder(registerFuncs...) - scheme := runtime.NewScheme() - utilruntime.Must(sb.AddToScheme(scheme)) - return scheme -} - -func CAPIRegisterFuncs() []func(*runtime.Scheme) error { - return []func(*runtime.Scheme) error{ - bootstrapv1.AddToScheme, - controlplanev1.AddToScheme, - clusterv1.AddToScheme, - } -} - -func CAPARegisterFuncs() []func(*runtime.Scheme) error { - return []func(*runtime.Scheme) error{ - capav1.AddToScheme, - } -} - -func CAPDRegisterFuncs() []func(*runtime.Scheme) error { - return []func(*runtime.Scheme) error{ - capdv1.AddToScheme, - } -} - -func CAPIScheme() *runtime.Scheme { - return NewScheme(CAPIRegisterFuncs()...) -} - -func CAPAScheme() *runtime.Scheme { - return NewScheme(append(CAPIRegisterFuncs(), CAPARegisterFuncs()...)...) -} - -func CAPDScheme() *runtime.Scheme { - return NewScheme(append(CAPIRegisterFuncs(), CAPDRegisterFuncs()...)...) -} diff --git a/common/pkg/capi/apis/unstructured_fallback.go b/common/pkg/capi/apis/unstructured_fallback.go deleted file mode 100644 index 4920b4b93..000000000 --- a/common/pkg/capi/apis/unstructured_fallback.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2023 Nutanix. All rights reserved. -// SPDX-License-Identifier: Apache-2.0 - -package apis - -import ( - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -type unstructructuredFallback struct { - defaultDecoder runtime.Decoder -} - -var _ runtime.Decoder = unstructructuredFallback{} - -func (u unstructructuredFallback) Decode( - data []byte, defaults *schema.GroupVersionKind, into runtime.Object, -) (runtime.Object, *schema.GroupVersionKind, error) { - if obj, gvk, err := u.defaultDecoder.Decode(data, defaults, into); err == nil { - return obj, gvk, nil - } - - return unstructured.UnstructuredJSONScheme.Decode(data, defaults, into) -} - -func NewDecoderWithUnstructuredFallback(decoder runtime.Decoder) runtime.Decoder { - return unstructructuredFallback{ - defaultDecoder: decoder, - } -} diff --git a/common/pkg/testutils/capitest/request/items.go b/common/pkg/testutils/capitest/request/items.go index 6f4a59596..30fde5184 100644 --- a/common/pkg/testutils/capitest/request/items.go +++ b/common/pkg/testutils/capitest/request/items.go @@ -15,8 +15,6 @@ import ( runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" capdv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" - capxv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" - capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/serializer" ) @@ -131,72 +129,6 @@ func NewKubeadmControlPlaneTemplateRequestItem( return NewKubeadmControlPlaneTemplateRequest(uid, kubeadmControlPlaneTemplateRequestObjectName) } -func NewAWSClusterTemplateRequestItem( - uid types.UID, - existingSpec ...capav1.AWSClusterTemplateSpec, -) runtimehooksv1.GeneratePatchesRequestItem { - awsClusterTemplate := &capav1.AWSClusterTemplate{ - TypeMeta: metav1.TypeMeta{ - APIVersion: capav1.GroupVersion.String(), - Kind: "AWSClusterTemplate", - }, - } - - switch len(existingSpec) { - case 0: - // Do nothing. - case 1: - awsClusterTemplate.Spec = existingSpec[0] - default: - panic("can only take at most one existing spec") - } - - return NewRequestItem( - awsClusterTemplate, - &runtimehooksv1.HolderReference{ - APIVersion: clusterv1.GroupVersion.String(), - Kind: "Cluster", - FieldPath: "spec.infrastructureRef", - Name: ClusterName, - Namespace: Namespace, - }, - uid, - ) -} - -func NewNutanixClusterTemplateRequestItem( - uid types.UID, - existingSpec ...capxv1.NutanixClusterTemplateSpec, -) runtimehooksv1.GeneratePatchesRequestItem { - nutanixClusterTemplate := &capxv1.NutanixClusterTemplate{ - TypeMeta: metav1.TypeMeta{ - APIVersion: capxv1.GroupVersion.String(), - Kind: "NutanixClusterTemplate", - }, - } - - switch len(existingSpec) { - case 0: - // Do nothing. - case 1: - nutanixClusterTemplate.Spec = existingSpec[0] - default: - panic("can only take at most one existing spec") - } - - return NewRequestItem( - nutanixClusterTemplate, - &runtimehooksv1.HolderReference{ - APIVersion: clusterv1.GroupVersion.String(), - Kind: "Cluster", - FieldPath: "spec.infrastructureRef", - Name: ClusterName, - Namespace: Namespace, - }, - uid, - ) -} - func NewCPDockerMachineTemplateRequestItem( uid types.UID, ) runtimehooksv1.GeneratePatchesRequestItem { @@ -242,95 +174,3 @@ func NewWorkerDockerMachineTemplateRequestItem( uid, ) } - -func NewCPAWSMachineTemplateRequestItem( - uid types.UID, -) runtimehooksv1.GeneratePatchesRequestItem { - return NewRequestItem( - &capav1.AWSMachineTemplate{ - TypeMeta: metav1.TypeMeta{ - APIVersion: capav1.GroupVersion.String(), - Kind: "AWSMachineTemplate", - }, - ObjectMeta: metav1.ObjectMeta{ - Name: "aws-machine-template", - Namespace: "aws-cluster", - }, - }, - &runtimehooksv1.HolderReference{ - APIVersion: controlplanev1.GroupVersion.String(), - Kind: "KubeadmControlPlane", - FieldPath: "spec.machineTemplate.infrastructureRef", - }, - uid, - ) -} - -func NewWorkerAWSMachineTemplateRequestItem( - uid types.UID, -) runtimehooksv1.GeneratePatchesRequestItem { - return NewRequestItem( - &capav1.AWSMachineTemplate{ - TypeMeta: metav1.TypeMeta{ - APIVersion: capav1.GroupVersion.String(), - Kind: "AWSMachineTemplate", - }, - ObjectMeta: metav1.ObjectMeta{ - Name: "aws-machine-template", - Namespace: "aws-cluster", - }, - }, - &runtimehooksv1.HolderReference{ - APIVersion: clusterv1.GroupVersion.String(), - Kind: "MachineDeployment", - FieldPath: "spec.template.spec.infrastructureRef", - }, - uid, - ) -} - -func NewCPNutanixMachineTemplateRequestItem( - uid types.UID, -) runtimehooksv1.GeneratePatchesRequestItem { - return NewRequestItem( - &capxv1.NutanixMachineTemplate{ - TypeMeta: metav1.TypeMeta{ - APIVersion: capxv1.GroupVersion.String(), - Kind: "NutanixMachineTemplate", - }, - ObjectMeta: metav1.ObjectMeta{ - Name: "nutanix-machine-template", - Namespace: "nutanix-cluster", - }, - }, - &runtimehooksv1.HolderReference{ - APIVersion: controlplanev1.GroupVersion.String(), - Kind: "KubeadmControlPlane", - FieldPath: "spec.machineTemplate.infrastructureRef", - }, - uid, - ) -} - -func NewWorkerNutanixMachineTemplateRequestItem( - uid types.UID, -) runtimehooksv1.GeneratePatchesRequestItem { - return NewRequestItem( - &capxv1.NutanixMachineTemplate{ - TypeMeta: metav1.TypeMeta{ - APIVersion: capxv1.GroupVersion.String(), - Kind: "NutanixMachineTemplate", - }, - ObjectMeta: metav1.ObjectMeta{ - Name: "nutanix-machine-template", - Namespace: "nutanix-cluster", - }, - }, - &runtimehooksv1.HolderReference{ - APIVersion: clusterv1.GroupVersion.String(), - Kind: "MachineDeployment", - FieldPath: "spec.template.spec.infrastructureRef", - }, - uid, - ) -} diff --git a/go.mod b/go.mod index 604e09521..7f842bf0b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix go 1.23 -toolchain go1.23.3 +toolchain go1.23.5 replace ( github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api => ./api diff --git a/internal/test/request/capa.go b/internal/test/request/capa.go new file mode 100644 index 000000000..352971e7c --- /dev/null +++ b/internal/test/request/capa.go @@ -0,0 +1,94 @@ +// Copyright 2025 Nutanix. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +package request + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" + runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" + + capxv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" +) + +func NewNutanixClusterTemplateRequestItem( + uid types.UID, + existingSpec ...capxv1.NutanixClusterTemplateSpec, +) runtimehooksv1.GeneratePatchesRequestItem { + nutanixClusterTemplate := &capxv1.NutanixClusterTemplate{ + TypeMeta: metav1.TypeMeta{ + APIVersion: capxv1.GroupVersion.String(), + Kind: "NutanixClusterTemplate", + }, + } + + switch len(existingSpec) { + case 0: + // Do nothing. + case 1: + nutanixClusterTemplate.Spec = existingSpec[0] + default: + panic("can only take at most one existing spec") + } + + return request.NewRequestItem( + nutanixClusterTemplate, + &runtimehooksv1.HolderReference{ + APIVersion: clusterv1.GroupVersion.String(), + Kind: "Cluster", + FieldPath: "spec.infrastructureRef", + Name: request.ClusterName, + Namespace: request.Namespace, + }, + uid, + ) +} + +func NewCPNutanixMachineTemplateRequestItem( + uid types.UID, +) runtimehooksv1.GeneratePatchesRequestItem { + return request.NewRequestItem( + &capxv1.NutanixMachineTemplate{ + TypeMeta: metav1.TypeMeta{ + APIVersion: capxv1.GroupVersion.String(), + Kind: "NutanixMachineTemplate", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: "nutanix-machine-template", + Namespace: "nutanix-cluster", + }, + }, + &runtimehooksv1.HolderReference{ + APIVersion: controlplanev1.GroupVersion.String(), + Kind: "KubeadmControlPlane", + FieldPath: "spec.machineTemplate.infrastructureRef", + }, + uid, + ) +} + +func NewWorkerNutanixMachineTemplateRequestItem( + uid types.UID, +) runtimehooksv1.GeneratePatchesRequestItem { + return request.NewRequestItem( + &capxv1.NutanixMachineTemplate{ + TypeMeta: metav1.TypeMeta{ + APIVersion: capxv1.GroupVersion.String(), + Kind: "NutanixMachineTemplate", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: "nutanix-machine-template", + Namespace: "nutanix-cluster", + }, + }, + &runtimehooksv1.HolderReference{ + APIVersion: clusterv1.GroupVersion.String(), + Kind: "MachineDeployment", + FieldPath: "spec.template.spec.infrastructureRef", + }, + uid, + ) +} diff --git a/internal/test/request/capx.go b/internal/test/request/capx.go new file mode 100644 index 000000000..32994c1ac --- /dev/null +++ b/internal/test/request/capx.go @@ -0,0 +1,94 @@ +// Copyright 2025 Nutanix. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +package request + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1" + runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" + + capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" +) + +func NewAWSClusterTemplateRequestItem( + uid types.UID, + existingSpec ...capav1.AWSClusterTemplateSpec, +) runtimehooksv1.GeneratePatchesRequestItem { + awsClusterTemplate := &capav1.AWSClusterTemplate{ + TypeMeta: metav1.TypeMeta{ + APIVersion: capav1.GroupVersion.String(), + Kind: "AWSClusterTemplate", + }, + } + + switch len(existingSpec) { + case 0: + // Do nothing. + case 1: + awsClusterTemplate.Spec = existingSpec[0] + default: + panic("can only take at most one existing spec") + } + + return request.NewRequestItem( + awsClusterTemplate, + &runtimehooksv1.HolderReference{ + APIVersion: clusterv1.GroupVersion.String(), + Kind: "Cluster", + FieldPath: "spec.infrastructureRef", + Name: request.ClusterName, + Namespace: request.Namespace, + }, + uid, + ) +} + +func NewCPAWSMachineTemplateRequestItem( + uid types.UID, +) runtimehooksv1.GeneratePatchesRequestItem { + return request.NewRequestItem( + &capav1.AWSMachineTemplate{ + TypeMeta: metav1.TypeMeta{ + APIVersion: capav1.GroupVersion.String(), + Kind: "AWSMachineTemplate", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: "aws-machine-template", + Namespace: "aws-cluster", + }, + }, + &runtimehooksv1.HolderReference{ + APIVersion: controlplanev1.GroupVersion.String(), + Kind: "KubeadmControlPlane", + FieldPath: "spec.machineTemplate.infrastructureRef", + }, + uid, + ) +} + +func NewWorkerAWSMachineTemplateRequestItem( + uid types.UID, +) runtimehooksv1.GeneratePatchesRequestItem { + return request.NewRequestItem( + &capav1.AWSMachineTemplate{ + TypeMeta: metav1.TypeMeta{ + APIVersion: capav1.GroupVersion.String(), + Kind: "AWSMachineTemplate", + }, + ObjectMeta: metav1.ObjectMeta{ + Name: "aws-machine-template", + Namespace: "aws-cluster", + }, + }, + &runtimehooksv1.HolderReference{ + APIVersion: clusterv1.GroupVersion.String(), + Kind: "MachineDeployment", + FieldPath: "spec.template.spec.infrastructureRef", + }, + uid, + ) +} diff --git a/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go b/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go index 215875dc9..1465f68d5 100644 --- a/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/ami/inject_control_plane_test.go @@ -11,7 +11,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/ami/inject_worker_test.go b/pkg/handlers/aws/mutation/ami/inject_worker_test.go index e056894a0..de2a4e341 100644 --- a/pkg/handlers/aws/mutation/ami/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/ami/inject_worker_test.go @@ -12,7 +12,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/cni/calico/inject_test.go b/pkg/handlers/aws/mutation/cni/calico/inject_test.go index f40331083..54e2ce655 100644 --- a/pkg/handlers/aws/mutation/cni/calico/inject_test.go +++ b/pkg/handlers/aws/mutation/cni/calico/inject_test.go @@ -14,7 +14,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go index a6026c384..84a608641 100644 --- a/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go +++ b/pkg/handlers/aws/mutation/controlplaneloadbalancer/inject_test.go @@ -14,7 +14,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go index 1a092bdf0..cbc0b3045 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_control_plane_test.go @@ -11,7 +11,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go index 72552e3d4..f4e81e99e 100644 --- a/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/iaminstanceprofile/inject_worker_test.go @@ -12,7 +12,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go b/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go index 69ee3dc14..cdbcc6049 100644 --- a/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/instancetype/inject_control_plane_test.go @@ -11,7 +11,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go b/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go index f79073d97..e03a614bf 100644 --- a/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/instancetype/inject_worker_test.go @@ -12,7 +12,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/network/inject_test.go b/pkg/handlers/aws/mutation/network/inject_test.go index e8380d1d7..bb55795c5 100644 --- a/pkg/handlers/aws/mutation/network/inject_test.go +++ b/pkg/handlers/aws/mutation/network/inject_test.go @@ -13,7 +13,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/region/inject_test.go b/pkg/handlers/aws/mutation/region/inject_test.go index 02ecb3e3d..a44bf6e68 100644 --- a/pkg/handlers/aws/mutation/region/inject_test.go +++ b/pkg/handlers/aws/mutation/region/inject_test.go @@ -13,7 +13,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go index e30c6c119..7b8ae0055 100644 --- a/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go +++ b/pkg/handlers/aws/mutation/securitygroups/inject_control_plane_test.go @@ -11,7 +11,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go b/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go index 605ab86a7..a5568d0b7 100644 --- a/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go +++ b/pkg/handlers/aws/mutation/securitygroups/inject_worker_test.go @@ -12,7 +12,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go index 8e5c0d75c..962778f9a 100644 --- a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go +++ b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject_test.go @@ -13,7 +13,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go index cb425b949..cb14f3056 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane_test.go @@ -14,7 +14,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go index 7b665157f..2aebb23c4 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker_test.go @@ -11,7 +11,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" ) diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go index 3a2858fab..1670d723c 100644 --- a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go +++ b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject_test.go @@ -13,7 +13,7 @@ import ( "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" - "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request" + "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/request" "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers" )