Skip to content

Commit 3c86792

Browse files
faiqfaiq
committed
refactor: use getter type
1 parent 9c9c8a6 commit 3c86792

File tree

30 files changed

+74
-63
lines changed

30 files changed

+74
-63
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package apis
66
import (
77
"k8s.io/apimachinery/pkg/runtime"
88
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
9-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
9+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1010
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
1111
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
1212
capdv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
@@ -25,7 +25,7 @@ func CAPIRegisterFuncs() []func(*runtime.Scheme) error {
2525
return []func(*runtime.Scheme) error{
2626
bootstrapv1.AddToScheme,
2727
controlplanev1.AddToScheme,
28-
capiv1.AddToScheme,
28+
clusterv1.AddToScheme,
2929
}
3030
}
3131

‎common/pkg/capi/clustertopology/handlers/helpers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package handlers
55

66
import (
7-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
7+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
88
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
99
"sigs.k8s.io/controller-runtime/pkg/client"
1010
)
@@ -13,7 +13,7 @@ func ClusterKeyFromReq(req *runtimehooksv1.GeneratePatchesRequest) client.Object
1313
for i := range req.Items {
1414
item := req.Items[i]
1515
if item.HolderReference.Kind == "Cluster" &&
16-
item.HolderReference.APIVersion == capiv1.GroupVersion.String() {
16+
item.HolderReference.APIVersion == clusterv1.GroupVersion.String() {
1717
return client.ObjectKey{
1818
Namespace: item.HolderReference.Namespace,
1919
Name: item.HolderReference.Name,

‎common/pkg/capi/clustertopology/handlers/mutation/meta.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1212
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1313
"k8s.io/apimachinery/pkg/runtime"
14-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
14+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1515
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1616
"sigs.k8s.io/cluster-api/exp/runtime/topologymutation"
1717
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -27,14 +27,16 @@ type MutateFunc func(
2727
clusterKey client.ObjectKey,
2828
) error
2929

30+
type ClusterGetter func(context.Context) (*clusterv1.Cluster, error)
31+
3032
type MetaMutator interface {
3133
Mutate(
3234
ctx context.Context,
3335
obj *unstructured.Unstructured,
3436
vars map[string]apiextensionsv1.JSON,
3537
holderRef runtimehooksv1.HolderReference,
3638
clusterKey client.ObjectKey,
37-
getCluster func() (*capiv1.Cluster, error),
39+
getCluster ClusterGetter,
3840
) error
3941
}
4042

@@ -66,13 +68,18 @@ func (mgp metaGeneratePatches) GeneratePatches(
6668
resp *runtimehooksv1.GeneratePatchesResponse,
6769
) {
6870
clusterKey := handlers.ClusterKeyFromReq(req)
69-
getCluster := sync.OnceValues[*capiv1.Cluster, error](func() (*capiv1.Cluster, error) {
70-
cluster := &capiv1.Cluster{}
71-
if err := mgp.cl.Get(ctx, clusterKey, cluster); err != nil {
71+
getCluster := func(ctx context.Context) (*clusterv1.Cluster, error) {
72+
cluster := &clusterv1.Cluster{}
73+
var err error
74+
fn := sync.OnceFunc(func() {
75+
err = mgp.cl.Get(ctx, clusterKey, cluster)
76+
})
77+
fn()
78+
if err != nil {
7279
return nil, fmt.Errorf("failed to fetch cluster %w", err)
7380
}
7481
return cluster, nil
75-
})
82+
}
7683

7784
topologymutation.WalkTemplates(
7885
ctx,

‎common/pkg/capi/clustertopology/handlers/mutation/meta_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"gomodules.xyz/jsonpatch/v2"
1515
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1616
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
17-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1817
bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
1918
controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
2019
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
@@ -23,7 +22,6 @@ import (
2322
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
2423
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2524
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request"
26-
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/helpers"
2725
)
2826

2927
type testHandler struct {
@@ -39,7 +37,7 @@ func (h *testHandler) Mutate(
3937
_ map[string]apiextensionsv1.JSON,
4038
holderRef runtimehooksv1.HolderReference,
4139
_ client.ObjectKey,
42-
_ func() (*capiv1.Cluster, error),
40+
_ ClusterGetter,
4341
) error {
4442
if h.returnErr {
4543
return fmt.Errorf("This is a failure")
@@ -222,7 +220,7 @@ func TestMetaGeneratePatches(t *testing.T) {
222220

223221
g := gomega.NewWithT(t)
224222

225-
h := NewMetaGeneratePatchesHandler("", helpers.TestEnv.Client, tt.mutaters...).(GeneratePatches)
223+
h := NewMetaGeneratePatchesHandler("", nil, tt.mutaters...).(GeneratePatches)
226224

227225
resp := &runtimehooksv1.GeneratePatchesResponse{}
228226
h.GeneratePatches(context.Background(), &runtimehooksv1.GeneratePatchesRequest{

‎common/pkg/testutils/capitest/patches.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
gomegatypes "github.com/onsi/gomega/types"
1515
"gomodules.xyz/jsonpatch/v2"
1616
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
17-
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
17+
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1818
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1919

2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
@@ -53,7 +53,7 @@ func ValidateGeneratePatches[T mutation.GeneratePatches](
5353
tt.RequestItem,
5454
{
5555
HolderReference: runtimehooksv1.HolderReference{
56-
APIVersion: capiv1.GroupVersion.String(),
56+
APIVersion: clusterv1.GroupVersion.String(),
5757
Kind: "Cluster",
5858
Namespace: request.Namespace,
5959
Name: request.ClusterName,
@@ -109,7 +109,7 @@ func AssertGeneratePatches[T mutation.GeneratePatches](
109109
tt.RequestItem,
110110
{
111111
HolderReference: runtimehooksv1.HolderReference{
112-
APIVersion: capiv1.GroupVersion.String(),
112+
APIVersion: clusterv1.GroupVersion.String(),
113113
Kind: "Cluster",
114114
Namespace: request.Namespace,
115115
Name: request.ClusterName,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515

1616
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1717
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
18+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1819
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1920
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
2021
)
@@ -48,7 +49,7 @@ func (h *awsAMISpecPatchHandler) Mutate(
4849
vars map[string]apiextensionsv1.JSON,
4950
holderRef runtimehooksv1.HolderReference,
5051
_ client.ObjectKey,
51-
_ func() (*clusterv1.Cluster, error),
52+
_ mutation.ClusterGetter,
5253
) error {
5354
log := ctrl.LoggerFrom(ctx).WithValues(
5455
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"github.com/go-logr/logr"
1111
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1212
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
13-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1413
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1514
ctrl "sigs.k8s.io/controller-runtime"
1615
"sigs.k8s.io/controller-runtime/pkg/client"
1716

1817
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1918
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
19+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
2121
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2222
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -57,7 +57,7 @@ func (h *calicoPatchHandler) Mutate(
5757
vars map[string]apiextensionsv1.JSON,
5858
holderRef runtimehooksv1.HolderReference,
5959
_ client.ObjectKey,
60-
_ func() (*clusterv1.Cluster, error),
60+
_ mutation.ClusterGetter,
6161
) error {
6262
log := ctrl.LoggerFrom(ctx).WithValues(
6363
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
11-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312
ctrl "sigs.k8s.io/controller-runtime"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514

1615
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1716
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
17+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1818
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1919
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -55,7 +55,7 @@ func (h *awsControlPlaneLoadBalancer) Mutate(
5555
vars map[string]apiextensionsv1.JSON,
5656
holderRef runtimehooksv1.HolderReference,
5757
_ client.ObjectKey,
58-
_ func() (*clusterv1.Cluster, error),
58+
_ mutation.ClusterGetter,
5959
) error {
6060
log := ctrl.LoggerFrom(ctx).WithValues(
6161
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
11-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312
ctrl "sigs.k8s.io/controller-runtime"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514

1615
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1716
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
17+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1818
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1919
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -56,7 +56,7 @@ func (h *awsIAMInstanceProfileControlPlanePatchHandler) Mutate(
5656
vars map[string]apiextensionsv1.JSON,
5757
holderRef runtimehooksv1.HolderReference,
5858
_ client.ObjectKey,
59-
_ func() (*clusterv1.Cluster, error),
59+
_ mutation.ClusterGetter,
6060
) error {
6161
log := ctrl.LoggerFrom(ctx).WithValues(
6262
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
11-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312
ctrl "sigs.k8s.io/controller-runtime"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514

1615
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1716
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
17+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1818
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1919
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -50,7 +50,7 @@ func (h *awsIAMInstanceProfileWorkerPatchHandler) Mutate(
5050
vars map[string]apiextensionsv1.JSON,
5151
holderRef runtimehooksv1.HolderReference,
5252
_ client.ObjectKey,
53-
_ func() (*clusterv1.Cluster, error),
53+
_ mutation.ClusterGetter,
5454
) error {
5555
log := ctrl.LoggerFrom(ctx).WithValues(
5656
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
11-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312
ctrl "sigs.k8s.io/controller-runtime"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514

1615
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1716
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
17+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1818
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1919
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -56,7 +56,7 @@ func (h *awsInstanceTypeControlPlanePatchHandler) Mutate(
5656
vars map[string]apiextensionsv1.JSON,
5757
holderRef runtimehooksv1.HolderReference,
5858
_ client.ObjectKey,
59-
_ func() (*clusterv1.Cluster, error),
59+
_ mutation.ClusterGetter,
6060
) error {
6161
log := ctrl.LoggerFrom(ctx).WithValues(
6262
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
11-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312
ctrl "sigs.k8s.io/controller-runtime"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514

1615
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1716
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
17+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1818
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1919
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -50,7 +50,7 @@ func (h *awsInstanceTypeWorkerPatchHandler) Mutate(
5050
vars map[string]apiextensionsv1.JSON,
5151
holderRef runtimehooksv1.HolderReference,
5252
_ client.ObjectKey,
53-
_ func() (*clusterv1.Cluster, error),
53+
_ mutation.ClusterGetter,
5454
) error {
5555
log := ctrl.LoggerFrom(ctx).WithValues(
5656
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
11-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312
ctrl "sigs.k8s.io/controller-runtime"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514

1615
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1716
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
17+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1818
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1919
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -55,7 +55,7 @@ func (h *awsNetworkPatchHandler) Mutate(
5555
vars map[string]apiextensionsv1.JSON,
5656
holderRef runtimehooksv1.HolderReference,
5757
_ client.ObjectKey,
58-
_ func() (*clusterv1.Cluster, error),
58+
_ mutation.ClusterGetter,
5959
) error {
6060
log := ctrl.LoggerFrom(ctx).WithValues(
6161
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1010
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
11-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1211
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1312
ctrl "sigs.k8s.io/controller-runtime"
1413
"sigs.k8s.io/controller-runtime/pkg/client"
1514

1615
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1716
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
17+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1818
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1919
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -55,7 +55,7 @@ func (h *awsRegionPatchHandler) Mutate(
5555
vars map[string]apiextensionsv1.JSON,
5656
holderRef runtimehooksv1.HolderReference,
5757
_ client.ObjectKey,
58-
_ func() (*clusterv1.Cluster, error),
58+
_ mutation.ClusterGetter,
5959
) error {
6060
log := ctrl.LoggerFrom(ctx).WithValues(
6161
"holderRef", holderRef,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515

1616
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
1717
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
18+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
1819
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
1920
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
2021
)
@@ -48,7 +49,7 @@ func (h *awsSecurityGroupSpecPatchHandler) Mutate(
4849
vars map[string]apiextensionsv1.JSON,
4950
holderRef runtimehooksv1.HolderReference,
5051
_ client.ObjectKey,
51-
_ func() (*clusterv1.Cluster, error),
52+
_ mutation.ClusterGetter,
5253
) error {
5354
log := ctrl.LoggerFrom(ctx).WithValues(
5455
"holderRef", holderRef,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010

1111
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1212
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
13-
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
1413
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
1514
capdv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"
1615
ctrl "sigs.k8s.io/controller-runtime"
1716
"sigs.k8s.io/controller-runtime/pkg/client"
1817

1918
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
19+
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
2020
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
2121
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
2222
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
@@ -61,7 +61,7 @@ func (h *customImageControlPlanePatchHandler) Mutate(
6161
vars map[string]apiextensionsv1.JSON,
6262
holderRef runtimehooksv1.HolderReference,
6363
_ client.ObjectKey,
64-
_ func() (*clusterv1.Cluster, error),
64+
_ mutation.ClusterGetter,
6565
) error {
6666
log := ctrl.LoggerFrom(ctx).WithValues(
6767
"holderRef", holderRef,

0 commit comments

Comments
 (0)