Merge pull request kubernetes-sigs#688 from CecileRobertMichon/cleanup

🌱 remove extra image validation in the Azure Machine controller

Author: k8s-ci-robot

controllers/azuremachine_controller.go

@@ -24,8 +24,6 @@ import (
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	kerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/client-go/tools/record"
 	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
 	"sigs.k8s.io/cluster-api-provider-azure/cloud/scope"
@@ -198,17 +196,6 @@ func (r *AzureMachineReconciler) reconcileNormal(ctx context.Context, machineSco
 		return reconcile.Result{}, nil
 	}
 
-	// Check that the image is valid
-	// NOTE: this validation logic is also in the validating webhook
-	if machineScope.AzureMachine.Spec.Image != nil {
-		if errs := infrav1.ValidateImage(machineScope.AzureMachine.Spec.Image, field.NewPath("image")); len(errs) > 0 {
-			agg := kerrors.NewAggregate(errs.ToAggregate().Errors())
-			machineScope.Info("Invalid image: %s", agg.Error())
-			r.Recorder.Eventf(machineScope.AzureMachine, corev1.EventTypeWarning, "InvalidImage", "Invalid image: %s", agg.Error())
-			return reconcile.Result{}, nil
-		}
-	}
-
 	if machineScope.AzureMachine.Spec.AvailabilityZone.ID != nil {
 		message := "AvailavilityZone is deprecated, use FailureDomain instead"
 		machineScope.Info(message)

controllers/azuremachine_reconciler.go

@@ -199,17 +199,16 @@ func (s *azureMachineService) getVirtualMachineZone() (string, error) {
 
 func (s *azureMachineService) reconcileNetworkInterface(nicName string) error {
 	networkInterfaceSpec := &networkinterfaces.Spec{
-		Name:        nicName,
-		VnetName:    s.clusterScope.Vnet().Name,
-		MachineRole: s.machineScope.Role(),
+		Name:                  nicName,
+		VnetName:              s.clusterScope.Vnet().Name,
+		MachineRole:           s.machineScope.Role(),
+		AcceleratedNetworking: s.machineScope.AzureMachine.Spec.AcceleratedNetworking,
 	}
 
 	if s.machineScope.AzureMachine.Spec.AllocatePublicIP == true {
 		networkInterfaceSpec.PublicIPName = azure.GenerateNodePublicIPName(nicName)
 	}
 
-	networkInterfaceSpec.AcceleratedNetworking = s.machineScope.AzureMachine.Spec.AcceleratedNetworking
-
 	switch role := s.machineScope.Role(); role {
 	case infrav1.Node:
 		networkInterfaceSpec.SubnetName = s.clusterScope.NodeSubnet().Name

exp/controllers/azuremachinepool_controller.go

@@ -25,13 +25,10 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	kerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/client-go/tools/record"
 	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	capierrors "sigs.k8s.io/cluster-api/errors"
@@ -214,18 +211,6 @@ func (r *AzureMachinePoolReconciler) reconcileNormal(ctx context.Context, machin
 		return reconcile.Result{}, nil
 	}
 
-	// Check that the image is valid
-	// NOTE: this validation logic is also in the validating webhook
-	if machinePoolScope.AzureMachinePool.Spec.Template.Image != nil {
-		image := machinePoolScope.AzureMachinePool.Spec.Template.Image
-		if errs := infrav1.ValidateImage(image, field.NewPath("image")); len(errs) > 0 {
-			agg := kerrors.NewAggregate(errs.ToAggregate().Errors())
-			machinePoolScope.Info("Invalid image: %s", agg.Error())
-			r.Recorder.Eventf(machinePoolScope.AzureMachinePool, corev1.EventTypeWarning, "InvalidImage", "Invalid image: %s", agg.Error())
-			return reconcile.Result{}, nil
-		}
-	}
-
 	ams := newAzureMachinePoolService(machinePoolScope, clusterScope)
 
 	// Get or create the virtual machine.