Prepare main branch for release-1.9

kubernetes-sigs · Oct 19, 2023 · c1b6d03 · c1b6d03
1 parent c2b813c
commit c1b6d03
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 173 deletions.
diff --git a/apis/v1beta1/vspherefailuredomain_types.go b/apis/v1beta1/vspherefailuredomain_types.go
@@ -56,11 +56,6 @@ type FailureDomain struct {
 
 	// TagCategory is the category used for the tag
 	TagCategory string `json:"tagCategory"`
-
-	// AutoConfigure tags the Type which is specified in the Topology
-	//
-	// Deprecated: This field is going to be removed in a future release.
-	AutoConfigure *bool `json:"autoConfigure,omitempty"`
 }
 
 // Topology describes a given failure domain using vSphere constructs.

diff --git a/apis/v1beta1/zz_generated.deepcopy.go b/apis/v1beta1/zz_generated.deepcopy.go
diff --git a/clusterctl-settings.json b/clusterctl-settings.json
@@ -2,6 +2,6 @@
   "name": "infrastructure-vsphere",
   "config": {
     "componentsFile": "infrastructure-components.yaml",
-    "nextVersion": "v1.8.0"
+    "nextVersion": "v1.9.0"
   }
 }
diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml
@@ -40,11 +40,6 @@ spec:
               region:
                 description: Region defines the name and type of a region
                 properties:
-                  autoConfigure:
-                    description: "AutoConfigure tags the Type which is specified in
-                      the Topology \n Deprecated: This field is going to be removed
-                      in a future release."
-                    type: boolean
                   name:
                     description: Name is the name of the tag that represents this
                       failure domain
@@ -105,11 +100,6 @@ spec:
               zone:
                 description: Zone defines the name and type of a zone
                 properties:
-                  autoConfigure:
-                    description: "AutoConfigure tags the Type which is specified in
-                      the Topology \n Deprecated: This field is going to be removed
-                      in a future release."
-                    type: boolean
                   name:
                     description: Name is the name of the tag that represents this
                       failure domain

diff --git a/controllers/vspherecluster_reconciler.go b/controllers/vspherecluster_reconciler.go
@@ -51,12 +51,6 @@ import (
 	infrautilv1 "sigs.k8s.io/cluster-api-provider-vsphere/pkg/util"
 )
 
-// legacyIdentityFinalizer is deprecated and should be used only while upgrading the cluster
-// from v1alpha3(v.0.7).
-//
-// Deprecated: legacyIdentityFinalizer will be removed in a future release.
-const legacyIdentityFinalizer string = "identity/infrastructure.cluster.x-k8s.io"
-
 type clusterReconciler struct {
 	ControllerManagerContext *capvcontext.ControllerManagerContext
 	Client                   client.Client
@@ -210,11 +204,6 @@ func (r *clusterReconciler) reconcileDelete(ctx context.Context, clusterCtx *cap
 		log.Info(fmt.Sprintf("Removing finalizer from Secret %s/%s having finalizers %v", secret.Namespace, secret.Name, secret.Finalizers))
 		ctrlutil.RemoveFinalizer(secret, infrav1.SecretIdentitySetFinalizer)
 
-		// Check if the old finalizer(from v0.7) is present, if yes, delete it
-		// For more context, please refer: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/issues/1482
-		if ctrlutil.ContainsFinalizer(secret, legacyIdentityFinalizer) {
-			ctrlutil.RemoveFinalizer(secret, legacyIdentityFinalizer)
-		}
 		if err := r.Client.Update(ctx, secret); err != nil {
 			return reconcile.Result{}, err
 		}

diff --git a/controllers/vsphereclusteridentity_controller.go b/controllers/vsphereclusteridentity_controller.go
@@ -192,11 +192,6 @@ func (r clusterIdentityReconciler) reconcileDelete(ctx context.Context, identity
 		return err
 	}
 	log.Info(fmt.Sprintf("Removing finalizer from Secret %s/%s", secret.Namespace, secret.Name))
-	// Check if the old finalizer(from v0.7) is present, if yes, delete it
-	// For more context, please refer: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/issues/1482
-	if ctrlutil.ContainsFinalizer(secret, legacyIdentityFinalizer) {
-		ctrlutil.RemoveFinalizer(secret, legacyIdentityFinalizer)
-	}
 	ctrlutil.RemoveFinalizer(secret, infrav1.SecretIdentitySetFinalizer)
 	if err := r.Client.Update(ctx, secret); err != nil {
 		return err

diff --git a/controllers/vspheredeploymentzone_controller_domain.go b/controllers/vspheredeploymentzone_controller_domain.go
@@ -85,9 +85,6 @@ func (r vsphereDeploymentZoneReconciler) reconcileFailureDomain(ctx context.Cont
 }
 
 func (r vsphereDeploymentZoneReconciler) reconcileInfraFailureDomain(ctx context.Context, deploymentZoneCtx *capvcontext.VSphereDeploymentZoneContext, vsphereFailureDomain *infrav1.VSphereFailureDomain, failureDomain infrav1.FailureDomain) error {
-	if *failureDomain.AutoConfigure {
-		return r.createAndAttachMetadata(ctx, deploymentZoneCtx, vsphereFailureDomain, failureDomain)
-	}
 	return r.verifyFailureDomain(ctx, deploymentZoneCtx, vsphereFailureDomain, failureDomain)
 }
 

diff --git a/controllers/vspheredeploymentzone_controller_domain_test.go b/controllers/vspheredeploymentzone_controller_domain_test.go
@@ -68,16 +68,14 @@ func TestVsphereDeploymentZoneReconciler_Reconcile_VerifyFailureDomain_ComputeCl
 	vsphereFailureDomain := &infrav1.VSphereFailureDomain{
 		Spec: infrav1.VSphereFailureDomainSpec{
 			Region: infrav1.FailureDomain{
-				Name:          "k8s-region-west",
-				Type:          infrav1.DatacenterFailureDomain,
-				TagCategory:   "k8s-region",
-				AutoConfigure: nil,
+				Name:        "k8s-region-west",
+				Type:        infrav1.DatacenterFailureDomain,
+				TagCategory: "k8s-region",
 			},
 			Zone: infrav1.FailureDomain{
-				Name:          "k8s-region-west-2",
-				Type:          infrav1.ComputeClusterFailureDomain,
-				TagCategory:   "k8s-region",
-				AutoConfigure: nil,
+				Name:        "k8s-region-west-2",
+				Type:        infrav1.ComputeClusterFailureDomain,
+				TagCategory: "k8s-region",
 			},
 			Topology: infrav1.Topology{
 				Datacenter:     "DC0",
@@ -148,16 +146,14 @@ func TestVsphereDeploymentZoneReconciler_Reconcile_VerifyFailureDomain_HostGroup
 	vsphereFailureDomain := &infrav1.VSphereFailureDomain{
 		Spec: infrav1.VSphereFailureDomainSpec{
 			Region: infrav1.FailureDomain{
-				Name:          "k8s-region-west",
-				Type:          infrav1.ComputeClusterFailureDomain,
-				TagCategory:   "k8s-region",
-				AutoConfigure: nil,
+				Name:        "k8s-region-west",
+				Type:        infrav1.ComputeClusterFailureDomain,
+				TagCategory: "k8s-region",
 			},
 			Zone: infrav1.FailureDomain{
-				Name:          "k8s-region-west-2",
-				Type:          infrav1.HostGroupFailureDomain,
-				TagCategory:   "k8s-region",
-				AutoConfigure: nil,
+				Name:        "k8s-region-west-2",
+				Type:        infrav1.HostGroupFailureDomain,
+				TagCategory: "k8s-region",
 			},
 			Topology: infrav1.Topology{
 				Datacenter:     "DC0",
@@ -226,10 +222,9 @@ func TestVsphereDeploymentZoneReconciler_Reconcile_CreateAndAttachMetadata(t *te
 			name: "create tag + category & attach to datacenter",
 			vsphereFailureDomainSpec: infrav1.VSphereFailureDomainSpec{
 				Region: infrav1.FailureDomain{
-					Name:          "k8s-region-west-1",
-					Type:          infrav1.DatacenterFailureDomain,
-					TagCategory:   "k8s-region",
-					AutoConfigure: nil,
+					Name:        "k8s-region-west-1",
+					Type:        infrav1.DatacenterFailureDomain,
+					TagCategory: "k8s-region",
 				},
 				Topology: infrav1.Topology{
 					Datacenter:     "DC0",
@@ -241,10 +236,9 @@ func TestVsphereDeploymentZoneReconciler_Reconcile_CreateAndAttachMetadata(t *te
 			name: "create tag + category & attach to compute cluster",
 			vsphereFailureDomainSpec: infrav1.VSphereFailureDomainSpec{
 				Zone: infrav1.FailureDomain{
-					Name:          "k8s-us-east-1",
-					Type:          infrav1.ComputeClusterFailureDomain,
-					TagCategory:   "k8s-zone",
-					AutoConfigure: nil,
+					Name:        "k8s-us-east-1",
+					Type:        infrav1.ComputeClusterFailureDomain,
+					TagCategory: "k8s-zone",
 				},
 				Topology: infrav1.Topology{
 					Datacenter:     "DC0",
@@ -256,10 +250,9 @@ func TestVsphereDeploymentZoneReconciler_Reconcile_CreateAndAttachMetadata(t *te
 			name: "create tag + category & attach to host group",
 			vsphereFailureDomainSpec: infrav1.VSphereFailureDomainSpec{
 				Zone: infrav1.FailureDomain{
-					Name:          "bar",
-					Type:          infrav1.HostGroupFailureDomain,
-					TagCategory:   "foo",
-					AutoConfigure: pointer.Bool(true),
+					Name:        "bar",
+					Type:        infrav1.HostGroupFailureDomain,
+					TagCategory: "foo",
 				},
 				Topology: infrav1.Topology{
 					Datacenter:     "DC0",

diff --git a/controllers/vspheredeploymentzone_controller_test.go b/controllers/vspheredeploymentzone_controller_test.go
@@ -82,16 +82,14 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {
 			},
 			Spec: infrav1.VSphereFailureDomainSpec{
 				Region: infrav1.FailureDomain{
-					Name:          "k8s-region-west",
-					Type:          infrav1.DatacenterFailureDomain,
-					TagCategory:   "k8s-region",
-					AutoConfigure: pointer.Bool(false),
+					Name:        "k8s-region-west",
+					Type:        infrav1.DatacenterFailureDomain,
+					TagCategory: "k8s-region",
 				},
 				Zone: infrav1.FailureDomain{
-					Name:          "k8s-zone-west-1",
-					Type:          infrav1.ComputeClusterFailureDomain,
-					TagCategory:   "k8s-zone",
-					AutoConfigure: pointer.Bool(false),
+					Name:        "k8s-zone-west-1",
+					Type:        infrav1.ComputeClusterFailureDomain,
+					TagCategory: "k8s-zone",
 				},
 				Topology: infrav1.Topology{
 					Datacenter:     "DC0",
@@ -163,16 +161,14 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {
 				},
 				Spec: infrav1.VSphereFailureDomainSpec{
 					Region: infrav1.FailureDomain{
-						Name:          "k8s-region-west",
-						Type:          infrav1.DatacenterFailureDomain,
-						TagCategory:   "k8s-region",
-						AutoConfigure: pointer.Bool(false),
+						Name:        "k8s-region-west",
+						Type:        infrav1.DatacenterFailureDomain,
+						TagCategory: "k8s-region",
 					},
 					Zone: infrav1.FailureDomain{
-						Name:          "k8s-zone-west-1",
-						Type:          infrav1.ComputeClusterFailureDomain,
-						TagCategory:   "k8s-zone",
-						AutoConfigure: pointer.Bool(false),
+						Name:        "k8s-zone-west-1",
+						Type:        infrav1.ComputeClusterFailureDomain,
+						TagCategory: "k8s-zone",
 					},
 					Topology: infrav1.Topology{
 						Datacenter:     "DC0",
@@ -336,16 +332,14 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {
 			},
 			Spec: infrav1.VSphereFailureDomainSpec{
 				Region: infrav1.FailureDomain{
-					Name:          "k8s-region-west",
-					Type:          infrav1.DatacenterFailureDomain,
-					TagCategory:   "k8s-region",
-					AutoConfigure: pointer.Bool(false),
+					Name:        "k8s-region-west",
+					Type:        infrav1.DatacenterFailureDomain,
+					TagCategory: "k8s-region",
 				},
 				Zone: infrav1.FailureDomain{
-					Name:          "k8s-zone-west-1",
-					Type:          infrav1.ComputeClusterFailureDomain,
-					TagCategory:   "k8s-zone",
-					AutoConfigure: pointer.Bool(false),
+					Name:        "k8s-zone-west-1",
+					Type:        infrav1.ComputeClusterFailureDomain,
+					TagCategory: "k8s-zone",
 				},
 				Topology: infrav1.Topology{
 					Datacenter:     "DC0",
@@ -408,16 +402,14 @@ func TestVSphereDeploymentZone_Reconcile(t *testing.T) {
 			},
 			Spec: infrav1.VSphereFailureDomainSpec{
 				Region: infrav1.FailureDomain{
-					Name:          "k8s-region-west",
-					Type:          infrav1.DatacenterFailureDomain,
-					TagCategory:   "k8s-region",
-					AutoConfigure: pointer.Bool(false),
+					Name:        "k8s-region-west",
+					Type:        infrav1.DatacenterFailureDomain,
+					TagCategory: "k8s-region",
 				},
 				Zone: infrav1.FailureDomain{
-					Name:          "k8s-zone-west-1",
-					Type:          infrav1.ComputeClusterFailureDomain,
-					TagCategory:   "k8s-zone",
-					AutoConfigure: pointer.Bool(false),
+					Name:        "k8s-zone-west-1",
+					Type:        infrav1.ComputeClusterFailureDomain,
+					TagCategory: "k8s-zone",
 				},
 				Topology: infrav1.Topology{
 					Datacenter:     "DC0",

diff --git a/internal/webhooks/vspherefailuredomain.go b/internal/webhooks/vspherefailuredomain.go
@@ -24,7 +24,6 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
@@ -103,17 +102,10 @@ func (webhook *VSphereFailureDomainWebhook) ValidateDelete(_ context.Context, _
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
 func (webhook *VSphereFailureDomainWebhook) Default(_ context.Context, obj runtime.Object) error {
-	typedObj, ok := obj.(*infrav1.VSphereFailureDomain)
+	_, ok := obj.(*infrav1.VSphereFailureDomain)
 	if !ok {
 		return apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereFailureDomain but got a %T", obj))
 	}
-	if typedObj.Spec.Zone.AutoConfigure == nil {
-		typedObj.Spec.Zone.AutoConfigure = pointer.Bool(false)
-	}
-
-	if typedObj.Spec.Region.AutoConfigure == nil {
-		typedObj.Spec.Region.AutoConfigure = pointer.Bool(false)
-	}
 
 	return nil
 }
diff --git a/internal/webhooks/vspherefailuredomain_test.go b/internal/webhooks/vspherefailuredomain_test.go
@@ -33,9 +33,6 @@ func TestVsphereFailureDomain_Default(t *testing.T) {
 	}
 	webhook := &VSphereFailureDomainWebhook{}
 	g.Expect(webhook.Default(context.Background(), m)).ToNot(HaveOccurred())
-
-	g.Expect(*m.Spec.Zone.AutoConfigure).To(BeFalse())
-	g.Expect(*m.Spec.Region.AutoConfigure).To(BeFalse())
 }
 
 func TestVSphereFailureDomain_ValidateCreate(t *testing.T) {
@@ -50,10 +47,9 @@ func TestVSphereFailureDomain_ValidateCreate(t *testing.T) {
 			name: "region failureDomain type is hostGroup",
 			failureDomain: infrav1.VSphereFailureDomain{Spec: infrav1.VSphereFailureDomainSpec{
 				Region: infrav1.FailureDomain{
-					Name:          "foo",
-					Type:          infrav1.HostGroupFailureDomain,
-					TagCategory:   "k8s-bar",
-					AutoConfigure: pointer.Bool(true),
+					Name:        "foo",
+					Type:        infrav1.HostGroupFailureDomain,
+					TagCategory: "k8s-bar",
 				},
 			}},
 		},

diff --git a/metadata.yaml b/metadata.yaml
@@ -30,3 +30,6 @@ releaseSeries:
   - major: 1
     minor: 8
     contract: v1beta1
+  - major: 1
+    minor: 9
+    contract: v1beta1
diff --git a/pkg/services/network/constants.go b/pkg/services/network/constants.go
@@ -30,9 +30,4 @@ const (
 
 	// SystemNamespace is the namespace where supervisor control plane VMs reside.
 	SystemNamespace = "kube-system"
-
-	// legacyDefaultNetworkLabel was the label used for default networks.
-	//
-	// Deprecated: legacyDefaultNetworkLabel will be removed in a future release.
-	legacyDefaultNetworkLabel = "capw.vmware.com/is-default-network"
 )
diff --git a/pkg/services/network/netop_provider.go b/pkg/services/network/netop_provider.go
@@ -24,7 +24,6 @@ import (
 	vmoprv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/cluster-api/util/conditions"
-	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	vmwarev1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/vmware/v1beta1"
@@ -55,15 +54,12 @@ func (np *netopNetworkProvider) ProvisionClusterNetwork(_ context.Context, clust
 }
 
 func (np *netopNetworkProvider) getDefaultClusterNetwork(ctx context.Context, clusterCtx *vmware.ClusterContext) (*netopv1.Network, error) {
-	log := ctrl.LoggerFrom(ctx)
-
 	networkWithLabel, err := np.getDefaultClusterNetworkWithLabel(ctx, clusterCtx, CAPVDefaultNetworkLabel)
 	if networkWithLabel != nil && err == nil {
 		return networkWithLabel, nil
 	}
 
-	log.Info("falling back to legacy label to identify default network", "label", legacyDefaultNetworkLabel)
-	return np.getDefaultClusterNetworkWithLabel(ctx, clusterCtx, legacyDefaultNetworkLabel)
+	return nil, nil
 }
 
 func (np *netopNetworkProvider) getDefaultClusterNetworkWithLabel(ctx context.Context, clusterCtx *vmware.ClusterContext, label string) (*netopv1.Network, error) {