Bump CAPI to v1.5.0

Makefile

@@ -157,7 +157,7 @@ CRD_ROOT ?= $(MANIFEST_ROOT)/crd/bases
 WEBHOOK_ROOT ?= $(MANIFEST_ROOT)/webhook
 RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac
 ASO_CRDS_PATH := $(MANIFEST_ROOT)/aso/crds.yaml
-ASO_VERSION := v2.1.0
+ASO_VERSION := v2.2.0
 ASO_CRDS := resourcegroups.resources.azure.com
 
 # Allow overriding the imagePullPolicy
@@ -301,7 +301,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
 	./hack/create-custom-cloud-provider-config.sh
 
 	# Deploy CAPI
-	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
+	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
 
 	# Deploy CAPZ
 	$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=$(KIND_CLUSTER_NAME)

Tiltfile

@@ -19,7 +19,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capz",
-    "capi_version": "v1.4.5",
+    "capi_version": "v1.5.0",
     "cert_manager_version": "v1.12.2",
     "kubernetes_version": "v1.27.2",
     "aks_kubernetes_version": "v1.26.3",

api/v1beta1/azurecluster_validation.go

@@ -28,6 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/cluster-api-provider-azure/feature"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 const (
@@ -68,15 +69,15 @@ var (
 )
 
 // validateCluster validates a cluster.
-func (c *AzureCluster) validateCluster(old *AzureCluster) error {
+func (c *AzureCluster) validateCluster(old *AzureCluster) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	allErrs = append(allErrs, c.validateClusterName()...)
 	allErrs = append(allErrs, c.validateClusterSpec(old)...)
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(
+	return nil, apierrors.NewInvalid(
 		schema.GroupKind{Group: "infrastructure.cluster.x-k8s.io", Kind: "AzureCluster"},
 		c.Name, allErrs)
 }

api/v1beta1/azurecluster_validation_test.go

@@ -115,7 +115,7 @@ func TestClusterWithPreexistingVnetValid(t *testing.T) {
 	}
 
 	t.Run(testCase.name, func(t *testing.T) {
-		err := testCase.cluster.validateCluster(nil)
+		_, err := testCase.cluster.validateCluster(nil)
 		g.Expect(err).To(BeNil())
 	})
 }
@@ -142,7 +142,7 @@ func TestClusterWithPreexistingVnetInvalid(t *testing.T) {
 	}
 
 	t.Run(testCase.name, func(t *testing.T) {
-		err := testCase.cluster.validateCluster(nil)
+		_, err := testCase.cluster.validateCluster(nil)
 		g.Expect(err).NotTo(BeNil())
 	})
 }
@@ -165,7 +165,7 @@ func TestClusterWithoutPreexistingVnetValid(t *testing.T) {
 	testCase.cluster.Spec.NetworkSpec.Vnet.ResourceGroup = ""
 
 	t.Run(testCase.name, func(t *testing.T) {
-		err := testCase.cluster.validateCluster(nil)
+		_, err := testCase.cluster.validateCluster(nil)
 		g.Expect(err).To(BeNil())
 	})
 }

api/v1beta1/azurecluster_webhook.go

@@ -25,6 +25,7 @@
 	webhookutils "sigs.k8s.io/cluster-api-provider-azure/util/webhook"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // SetupWebhookWithManager sets up and registers the webhook with the manager.
@@ -46,12 +47,12 @@
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureCluster) ValidateCreate() error {
+func (c *AzureCluster) ValidateCreate() (admission.Warnings, error) {
 	return c.validateCluster(nil)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureCluster) ValidateUpdate(oldRaw runtime.Object) error {
+func (c *AzureCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	old := oldRaw.(*AzureCluster)
 
@@ -135,7 +136,7 @@
 		return c.validateCluster(old)
 	}
 
-	return apierrors.NewInvalid(GroupVersion.WithKind("AzureCluster").GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureCluster").GroupKind(), c.Name, allErrs)
 }
 
 // validateSubnetUpdate validates a ClusterSpec.NetworkSpec.Subnets for immutability.
@@ -187,6 +188,6 @@
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureCluster) ValidateDelete() error {
-	return nil
+func (c *AzureCluster) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
 }

api/v1beta1/azurecluster_webhook_test.go

@@ -109,7 +109,7 @@ func TestAzureCluster_ValidateCreate(t *testing.T) {
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			err := tc.cluster.ValidateCreate()
+			_, err := tc.cluster.ValidateCreate()
 			if tc.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
@@ -347,7 +347,7 @@ func TestAzureCluster_ValidateUpdate(t *testing.T) {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
-			err := tc.cluster.ValidateUpdate(tc.oldCluster)
+			_, err := tc.cluster.ValidateUpdate(tc.oldCluster)
 			if tc.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {

api/v1beta1/azureclusteridentity_validation.go

@@ -19,17 +19,18 @@ package v1beta1
 import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
-func (c *AzureClusterIdentity) validateClusterIdentity() error {
+func (c *AzureClusterIdentity) validateClusterIdentity() (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	if c.Spec.Type == UserAssignedMSI && c.Spec.ResourceID == "" {
 		allErrs = append(allErrs, field.Required(field.NewPath("spec", "resourceID"), c.Spec.ResourceID))
 	} else if c.Spec.Type != UserAssignedMSI && c.Spec.ResourceID != "" {
 		allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "resourceID"), c.Spec.ResourceID))
 	}
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
-	return apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)
 }

api/v1beta1/azureclusteridentity_webhook.go

@@ -23,6 +23,7 @@
 	webhookutils "sigs.k8s.io/cluster-api-provider-azure/util/webhook"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // SetupWebhookWithManager sets up and registers the webhook with the manager.
@@ -37,12 +38,12 @@
 var _ webhook.Validator = &AzureClusterIdentity{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureClusterIdentity) ValidateCreate() error {
+func (c *AzureClusterIdentity) ValidateCreate() (admission.Warnings, error) {
 	return c.validateClusterIdentity()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureClusterIdentity) ValidateUpdate(oldRaw runtime.Object) error {
+func (c *AzureClusterIdentity) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	old := oldRaw.(*AzureClusterIdentity)
 	if err := webhookutils.ValidateImmutable(
@@ -54,10 +55,10 @@
 	if len(allErrs) == 0 {
 		return c.validateClusterIdentity()
 	}
-	return apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureClusterIdentity) ValidateDelete() error {
-	return nil
+func (c *AzureClusterIdentity) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
 }

api/v1beta1/azureclusteridentity_webhook_test.go

@@ -84,7 +84,7 @@ func TestAzureClusterIdentity_ValidateCreate(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			err := tc.clusterIdentity.ValidateCreate()
+			_, err := tc.clusterIdentity.ValidateCreate()
 			if tc.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
@@ -165,7 +165,7 @@ func TestAzureClusterIdentity_ValidateUpdate(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			err := tc.clusterIdentity.ValidateUpdate(tc.oldClusterIdentity)
+			_, err := tc.clusterIdentity.ValidateUpdate(tc.oldClusterIdentity)
 			if tc.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {

api/v1beta1/azureclustertemplate_validation.go

@@ -22,17 +22,18 @@
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
-func (c *AzureClusterTemplate) validateClusterTemplate() error {
+func (c *AzureClusterTemplate) validateClusterTemplate() (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	allErrs = append(allErrs, c.validateClusterTemplateSpec()...)
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(
+	return nil, apierrors.NewInvalid(
 		schema.GroupKind{Group: "infrastructure.cluster.x-k8s.io", Kind: "AzureClusterTemplate"},
 		c.Name, allErrs)
 }

api/v1beta1/azureclustertemplate_webhook.go

@@ -24,6 +24,7 @@
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // AzureClusterTemplateImmutableMsg is the message used for errors on fields that are immutable.
@@ -49,12 +50,12 @@
 var _ webhook.Validator = &AzureClusterTemplate{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureClusterTemplate) ValidateCreate() error {
+func (c *AzureClusterTemplate) ValidateCreate() (admission.Warnings, error) {
 	return c.validateClusterTemplate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureClusterTemplate) ValidateUpdate(oldRaw runtime.Object) error {
+func (c *AzureClusterTemplate) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	old := oldRaw.(*AzureClusterTemplate)
 	if !reflect.DeepEqual(c.Spec.Template.Spec, old.Spec.Template.Spec) {
@@ -64,12 +65,12 @@
 	}
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
-	return apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterTemplate").GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterTemplate").GroupKind(), c.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (c *AzureClusterTemplate) ValidateDelete() error {
-	return nil
+func (c *AzureClusterTemplate) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
 }

api/v1beta1/azureclustertemplate_webhook_test.go

@@ -57,6 +57,7 @@ func TestValidateUpdate(t *testing.T) {
 
 	t.Run("template is immutable", func(t *testing.T) {
 		g := NewWithT(t)
-		g.Expect(newClusterTemplate.ValidateUpdate(oldClusterTemplate)).NotTo(Succeed())
+		_, err := newClusterTemplate.ValidateUpdate(oldClusterTemplate)
+		g.Expect(err).To(HaveOccurred())
 	})
 }

api/v1beta1/azuremachine_webhook.go

@@ -26,6 +26,7 @@
 	webhookutils "sigs.k8s.io/cluster-api-provider-azure/util/webhook"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // SetupAzureMachineWebhookWithManager sets up and registers the webhook with the manager.
@@ -47,10 +48,10 @@
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (mw *azureMachineWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) error {
+func (mw *azureMachineWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	m, ok := obj.(*AzureMachine)
 	if !ok {
-		return apierrors.NewBadRequest("expected an AzureMachine resource")
+		return nil, apierrors.NewBadRequest("expected an AzureMachine resource")
 	}
 	spec := m.Spec
 
@@ -66,22 +67,22 @@
 	}
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(GroupVersion.WithKind("AzureMachine").GroupKind(), m.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureMachine").GroupKind(), m.Name, allErrs)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (mw *azureMachineWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) error {
+func (mw *azureMachineWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	old, ok := oldObj.(*AzureMachine)
 	if !ok {
-		return apierrors.NewBadRequest("expected an AzureMachine resource")
+		return nil, apierrors.NewBadRequest("expected an AzureMachine resource")
 	}
 	m, ok := newObj.(*AzureMachine)
 	if !ok {
-		return apierrors.NewBadRequest("expected an AzureMachine resource")
+		return nil, apierrors.NewBadRequest("expected an AzureMachine resource")
 	}
 
 	if err := webhookutils.ValidateImmutable(
@@ -206,14 +207,14 @@
 	}
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
-	return apierrors.NewInvalid(GroupVersion.WithKind("AzureMachine").GroupKind(), m.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureMachine").GroupKind(), m.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (mw *azureMachineWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) error {
-	return nil
+func (mw *azureMachineWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	return nil, nil
 }
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.

api/v1beta1/azuremachine_webhook_test.go

@@ -221,7 +221,7 @@ func TestAzureMachine_ValidateCreate(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			mw := &azureMachineWebhook{}
-			err := mw.ValidateCreate(context.Background(), tc.machine)
+			_, err := mw.ValidateCreate(context.Background(), tc.machine)
 			if tc.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {
@@ -798,7 +798,7 @@ func TestAzureMachine_ValidateUpdate(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			mw := &azureMachineWebhook{}
-			err := mw.ValidateUpdate(context.Background(), tc.oldMachine, tc.newMachine)
+			_, err := mw.ValidateUpdate(context.Background(), tc.oldMachine, tc.newMachine)
 			if tc.wantErr {
 				g.Expect(err).To(HaveOccurred())
 			} else {