Merge pull request #4762 from nojnhuh/v2-controlplaneendpoint

set AzureASOManagedCluster spec.controlPlaneEndpoint

Author: k8s-ci-robot

api/v1beta1/azuremanagedcluster_types.go

@@ -25,6 +25,8 @@ import (
 type AzureManagedClusterSpec struct {
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// Immutable, populated by the AKS API at create.
+	// Because this field is programmatically set by CAPZ after resource creation, we define it as +optional
+	// in the API schema to permit resource admission.
 	// +optional
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 }

config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedclusters.yaml

@@ -40,6 +40,24 @@ spec:
           spec:
             description: AzureASOManagedClusterSpec defines the desired state of AzureASOManagedCluster.
             properties:
+              controlPlaneEndpoint:
+                description: |-
+                  ControlPlaneEndpoint is the location of the API server within the control plane. CAPZ manages this field
+                  and it should not be set by the user. It fulfills Cluster API's cluster infrastructure provider contract.
+                  Because this field is programmatically set by CAPZ after resource creation, we define it as +optional
+                  in the API schema to permit resource admission.
+                properties:
+                  host:
+                    description: The hostname on which the API server is serving.
+                    type: string
+                  port:
+                    description: The port on which the API server is serving.
+                    format: int32
+                    type: integer
+                required:
+                - host
+                - port
+                type: object
               resources:
                 description: Resources are embedded ASO resources to be managed by
                   this resource.

config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedcontrolplanes.yaml

@@ -53,6 +53,21 @@ spec:
             description: AzureASOManagedControlPlaneStatus defines the observed state
               of AzureASOManagedControlPlane.
             properties:
+              controlPlaneEndpoint:
+                description: ControlPlaneEndpoint represents the endpoint for the
+                  cluster's API server.
+                properties:
+                  host:
+                    description: The hostname on which the API server is serving.
+                    type: string
+                  port:
+                    description: The port on which the API server is serving.
+                    format: int32
+                    type: integer
+                required:
+                - host
+                - port
+                type: object
               resources:
                 items:
                   description: ResourceStatus represents the status of a resource.

config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedclusters.yaml

@@ -60,6 +60,8 @@ spec:
                 description: |-
                   ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
                   Immutable, populated by the AKS API at create.
+                  Because this field is programmatically set by CAPZ after resource creation, we define it as +optional
+                  in the API schema to permit resource admission.
                 properties:
                   host:
                     description: The hostname on which the API server is serving.

exp/api/v1alpha1/azureasomanagedcluster_types.go

@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
 const (
@@ -31,6 +32,13 @@ const (
 // AzureASOManagedClusterSpec defines the desired state of AzureASOManagedCluster.
 type AzureASOManagedClusterSpec struct {
 	AzureASOManagedClusterTemplateResourceSpec `json:",inline"`
+
+	// ControlPlaneEndpoint is the location of the API server within the control plane. CAPZ manages this field
+	// and it should not be set by the user. It fulfills Cluster API's cluster infrastructure provider contract.
+	// Because this field is programmatically set by CAPZ after resource creation, we define it as +optional
+	// in the API schema to permit resource admission.
+	//+optional
+	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 }
 
 // AzureASOManagedClusterStatus defines the observed state of AzureASOManagedCluster.

exp/api/v1alpha1/azureasomanagedcontrolplane_types.go

@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
 // AzureASOManagedControlPlaneKind is the kind for AzureASOManagedControlPlane.
@@ -32,6 +33,10 @@ type AzureASOManagedControlPlaneSpec struct {
 type AzureASOManagedControlPlaneStatus struct {
 	//+optional
 	Resources []ResourceStatus `json:"resources,omitempty"`
+
+	// ControlPlaneEndpoint represents the endpoint for the cluster's API server.
+	//+optional
+	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 }
 
 //+kubebuilder:object:root=true

exp/api/v1alpha1/zz_generated.deepcopy.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	infracontroller "sigs.k8s.io/cluster-api-provider-azure/controllers"
@@ -36,7 +37,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
@@ -83,6 +86,25 @@ func (r *AzureASOManagedClusterReconciler) SetupWithManager(ctx context.Context,
 				infracontroller.ClusterUpdatePauseChange(log),
 			),
 		).
+		Watches(
+			&infrav1exp.AzureASOManagedControlPlane{},
+			handler.EnqueueRequestsFromMapFunc(asoManagedControlPlaneToManagedClusterMap(r.Client)),
+			builder.WithPredicates(
+				predicates.ResourceHasFilterLabel(log, r.WatchFilterValue),
+				predicate.Funcs{
+					CreateFunc: func(ev event.CreateEvent) bool {
+						controlPlane := ev.Object.(*infrav1exp.AzureASOManagedControlPlane)
+						return !controlPlane.Status.ControlPlaneEndpoint.IsZero()
+					},
+					UpdateFunc: func(ev event.UpdateEvent) bool {
+						oldControlPlane := ev.ObjectOld.(*infrav1exp.AzureASOManagedControlPlane)
+						newControlPlane := ev.ObjectNew.(*infrav1exp.AzureASOManagedControlPlane)
+						return oldControlPlane.Status.ControlPlaneEndpoint !=
+							newControlPlane.Status.ControlPlaneEndpoint
+					},
+				},
+			),
+		).
 		Build(r)
 	if err != nil {
 		return err
@@ -105,6 +127,33 @@ func (r *AzureASOManagedClusterReconciler) SetupWithManager(ctx context.Context,
 	return nil
 }
 
+func asoManagedControlPlaneToManagedClusterMap(c client.Client) handler.MapFunc {
+	return func(ctx context.Context, o client.Object) []reconcile.Request {
+		asoManagedControlPlane := o.(*infrav1exp.AzureASOManagedControlPlane)
+
+		cluster, err := util.GetOwnerCluster(ctx, c, asoManagedControlPlane.ObjectMeta)
+		if err != nil {
+			return nil
+		}
+
+		if cluster == nil ||
+			cluster.Spec.InfrastructureRef == nil ||
+			cluster.Spec.InfrastructureRef.APIVersion != infrav1exp.GroupVersion.Identifier() ||
+			cluster.Spec.InfrastructureRef.Kind != infrav1exp.AzureASOManagedClusterKind {
+			return nil
+		}
+
+		return []reconcile.Request{
+			{
+				NamespacedName: client.ObjectKey{
+					Namespace: cluster.Spec.InfrastructureRef.Namespace,
+					Name:      cluster.Spec.InfrastructureRef.Name,
+				},
+			},
+		}
+	}
+}
+
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedclusters,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedclusters/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedclusters/finalizers,verbs=update
@@ -191,6 +240,18 @@ func (r *AzureASOManagedClusterReconciler) reconcileNormal(ctx context.Context,
 		}
 	}
 
+	asoManagedControlPlane := &infrav1exp.AzureASOManagedControlPlane{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: cluster.Spec.ControlPlaneRef.Namespace,
+			Name:      cluster.Spec.ControlPlaneRef.Name,
+		},
+	}
+	err = r.Get(ctx, client.ObjectKeyFromObject(asoManagedControlPlane), asoManagedControlPlane)
+	if client.IgnoreNotFound(err) != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to get AzureASOManagedControlPlane %s/%s: %w", asoManagedControlPlane.Namespace, asoManagedControlPlane.Name, err)
+	}
+	asoManagedCluster.Spec.ControlPlaneEndpoint = asoManagedControlPlane.Status.ControlPlaneEndpoint
+
 	return ctrl.Result{}, nil
 }
 

exp/controllers/azureasomanagedcluster_controller.go

@@ -219,6 +219,8 @@ func TestAzureASOManagedClusterReconcile(t *testing.T) {
 				ControlPlaneRef: &corev1.ObjectReference{
 					APIVersion: infrav1exp.GroupVersion.Identifier(),
 					Kind:       infrav1exp.AzureASOManagedControlPlaneKind,
+					Name:       "amcp",
+					Namespace:  "ns",
 				},
 			},
 		}
@@ -238,8 +240,17 @@ func TestAzureASOManagedClusterReconcile(t *testing.T) {
 				},
 			},
 		}
+		asoManagedControlPlane := &infrav1exp.AzureASOManagedControlPlane{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "amcp",
+				Namespace: cluster.Namespace,
+			},
+			Status: infrav1exp.AzureASOManagedControlPlaneStatus{
+				ControlPlaneEndpoint: clusterv1.APIEndpoint{Host: "endpoint"},
+			},
+		}
 		c := fakeClientBuilder().
-			WithObjects(cluster, asoManagedCluster).
+			WithObjects(cluster, asoManagedCluster, asoManagedControlPlane).
 			Build()
 		r := &AzureASOManagedClusterReconciler{
 			Client: c,
@@ -254,6 +265,9 @@ func TestAzureASOManagedClusterReconcile(t *testing.T) {
 		result, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: client.ObjectKeyFromObject(asoManagedCluster)})
 		g.Expect(err).NotTo(HaveOccurred())
 		g.Expect(result).To(Equal(ctrl.Result{}))
+
+		g.Expect(c.Get(ctx, client.ObjectKeyFromObject(asoManagedCluster), asoManagedCluster)).To(Succeed())
+		g.Expect(asoManagedCluster.Spec.ControlPlaneEndpoint.Host).To(Equal("endpoint"))
 	})
 
 	t.Run("successfully reconciles pause", func(t *testing.T) {

exp/controllers/azureasomanagedcluster_controller_test.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 
+	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	infracontroller "sigs.k8s.io/cluster-api-provider-azure/controllers"
 	infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha1"
@@ -174,6 +175,19 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileNormal(ctx context.Cont
 	if err != nil {
 		return ctrl.Result{}, err
 	}
+
+	var managedClusterName string
+	for _, resource := range us {
+		if resource.GroupVersionKind().Group == asocontainerservicev1.GroupVersion.Group &&
+			resource.GroupVersionKind().Kind == "ManagedCluster" {
+			managedClusterName = resource.GetName()
+			break
+		}
+	}
+	if managedClusterName == "" {
+		return ctrl.Result{}, reconcile.TerminalError(fmt.Errorf("no %s ManagedCluster defined in AzureASOManagedControlPlane spec.resources", asocontainerservicev1.GroupVersion.Group))
+	}
+
 	resourceReconciler := r.newResourceReconciler(asoManagedControlPlane, us)
 	err = resourceReconciler.Reconcile(ctx)
 	if err != nil {
@@ -185,6 +199,14 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileNormal(ctx context.Cont
 		}
 	}
 
+	managedCluster := &asocontainerservicev1.ManagedCluster{}
+	err = r.Get(ctx, client.ObjectKey{Namespace: asoManagedControlPlane.Namespace, Name: managedClusterName}, managedCluster)
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("error getting ManagedCluster: %w", err)
+	}
+
+	asoManagedControlPlane.Status.ControlPlaneEndpoint = getControlPlaneEndpoint(managedCluster)
+
 	return ctrl.Result{}, nil
 }
 
@@ -224,3 +246,19 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileDelete(ctx context.Cont
 	controllerutil.RemoveFinalizer(asoManagedControlPlane, infrav1exp.AzureASOManagedControlPlaneFinalizer)
 	return ctrl.Result{}, nil
 }
+
+func getControlPlaneEndpoint(managedCluster *asocontainerservicev1.ManagedCluster) clusterv1.APIEndpoint {
+	if managedCluster.Status.PrivateFQDN != nil {
+		return clusterv1.APIEndpoint{
+			Host: *managedCluster.Status.PrivateFQDN,
+			Port: 443,
+		}
+	}
+	if managedCluster.Status.Fqdn != nil {
+		return clusterv1.APIEndpoint{
+			Host: *managedCluster.Status.Fqdn,
+			Port: 443,
+		}
+	}
+	return clusterv1.APIEndpoint{}
+}