fixup! after rebase

Author: dkoshkin

pkg/handlers/generic/mutation/mirrors/inject.go

@@ -23,7 +23,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	registrymirrorutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/registrymirror/utils"
+	registryutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/lifecycle/registry/utils"
 	handlersutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/utils"
 )
 
@@ -84,24 +84,24 @@ func (h *globalMirrorPatchHandler) Mutate(
 		v1alpha1.ImageRegistriesVariableName,
 	)
 
-	_, registryMirrorErr := variables.Get[v1alpha1.RegistryMirror](
+	_, registryAddonErr := variables.Get[v1alpha1.RegistryAddon](
 		vars,
 		v1alpha1.ClusterConfigVariableName,
-		[]string{"addons", v1alpha1.RegistryMirrorVariableName}...)
+		[]string{"addons", v1alpha1.RegistryAddonVariableName}...)
 
 	switch {
 	case variables.IsNotFoundError(imageRegistriesErr) &&
 		variables.IsNotFoundError(globalMirrorErr) &&
-		variables.IsNotFoundError(registryMirrorErr):
+		variables.IsNotFoundError(registryAddonErr):
 		log.V(5).
-			Info("Image Registry Credentials and Global Registry Mirror and Registry Mirror Addon variable not defined")
+			Info("Image Registry Credentials and Global Registry Mirror and Registry Addon variable not defined")
 		return nil
 	case imageRegistriesErr != nil && !variables.IsNotFoundError(imageRegistriesErr):
 		return imageRegistriesErr
 	case globalMirrorErr != nil && !variables.IsNotFoundError(globalMirrorErr):
 		return globalMirrorErr
-	case registryMirrorErr != nil && !variables.IsNotFoundError(registryMirrorErr):
-		return registryMirrorErr
+	case registryAddonErr != nil && !variables.IsNotFoundError(registryAddonErr):
+		return registryAddonErr
 	}
 
 	var registriesWithOptionalCA []containerdConfig //nolint:prealloc // We don't know the size of the slice yet.
@@ -133,7 +133,7 @@ func (h *globalMirrorPatchHandler) Mutate(
 			registryWithOptionalCredentials,
 		)
 	}
-	if registryMirrorErr == nil {
+	if registryAddonErr == nil {
 		cluster, err := clusterGetter(ctx)
 		if err != nil {
 			log.Error(
@@ -143,7 +143,7 @@ func (h *globalMirrorPatchHandler) Mutate(
 			return err
 		}
 
-		registryConfig, err := containerdConfigFromRegistryMirrorAddon(cluster)
+		registryConfig, err := containerdConfigFromRegistryAddon(cluster)
 		if err != nil {
 			return err
 		}
@@ -262,10 +262,10 @@ func containerdConfigFromImageRegistry(
 	return configWithOptionalCACert, nil
 }
 
-func containerdConfigFromRegistryMirrorAddon(cluster *clusterv1.Cluster) (containerdConfig, error) {
-	serviceIP, err := registrymirrorutils.ServiceIPForCluster(cluster)
+func containerdConfigFromRegistryAddon(cluster *clusterv1.Cluster) (containerdConfig, error) {
+	serviceIP, err := registryutils.ServiceIPForCluster(cluster)
 	if err != nil {
-		return containerdConfig{}, fmt.Errorf("error getting service IP for the registry mirror addon: %w", err)
+		return containerdConfig{}, fmt.Errorf("error getting service IP for the registry addon: %w", err)
 	}
 
 	config := containerdConfig{

pkg/handlers/generic/mutation/mirrors/inject_test.go

@@ -339,12 +339,12 @@ var _ = Describe("Generate Global mirror patches", func() {
 			},
 		},
 		{
-			Name: "files added in KubeadmControlPlaneTemplate for registry mirror addon",
+			Name: "files added in KubeadmControlPlaneTemplate for registry addon",
 			Vars: []runtimehooksv1.Variable{
 				capitest.VariableWithValue(
 					v1alpha1.ClusterConfigVariableName,
-					v1alpha1.RegistryMirror{},
-					[]string{"addons", v1alpha1.RegistryMirrorVariableName}...,
+					v1alpha1.RegistryAddon{},
+					[]string{"addons", v1alpha1.RegistryAddonVariableName}...,
 				),
 			},
 			RequestItem: request.NewKubeadmControlPlaneTemplateRequestItem(""),
@@ -364,12 +364,12 @@ var _ = Describe("Generate Global mirror patches", func() {
 			},
 		},
 		{
-			Name: "files added in KubeadmConfigTemplate for registry mirror addon",
+			Name: "files added in KubeadmConfigTemplate for registry addon",
 			Vars: []runtimehooksv1.Variable{
 				capitest.VariableWithValue(
 					v1alpha1.ClusterConfigVariableName,
-					v1alpha1.RegistryMirror{},
-					[]string{"addons", v1alpha1.RegistryMirrorVariableName}...,
+					v1alpha1.RegistryAddon{},
+					[]string{"addons", v1alpha1.RegistryAddonVariableName}...,
 				),
 				capitest.VariableWithValue(
 					"builtin",
@@ -418,6 +418,13 @@ var _ = Describe("Generate Global mirror patches", func() {
 					Name:      request.ClusterName,
 					Namespace: request.Namespace,
 				},
+				Spec: clusterv1.ClusterSpec{
+					ClusterNetwork: &clusterv1.ClusterNetwork{
+						Services: &clusterv1.NetworkRanges{
+							CIDRBlocks: []string{"192.168.0.1/16"},
+						},
+					},
+				},
 			},
 		)).To(gomega.BeNil())
 	})