add spec.version and status.version to AzureASOManagedControlPlane

Author: nojnhuh

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

@@ -48,6 +48,11 @@ spec:
                   type: object
                   x-kubernetes-preserve-unknown-fields: true
                 type: array
+              version:
+                description: |-
+                  Version is the Kubernetes version of the control plane. It fulfills Cluster API's control plane
+                  provider contract.
+                type: string
             type: object
           status:
             description: AzureASOManagedControlPlaneStatus defines the observed state
@@ -96,6 +101,11 @@ spec:
                   - resource
                   type: object
                 type: array
+              version:
+                description: |-
+                  Version is the observed Kubernetes version of the control plane. It fulfills Cluster API's control
+                  plane provider contract.
+                type: string
             type: object
         type: object
     served: true

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

@@ -56,6 +56,11 @@ spec:
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         type: array
+                      version:
+                        description: |-
+                          Version is the Kubernetes version of the control plane. It fulfills Cluster API's control plane
+                          provider contract.
+                        type: string
                     type: object
                 type: object
             required:

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

@@ -56,6 +56,11 @@ spec:
                           type: object
                           x-kubernetes-preserve-unknown-fields: true
                         type: array
+                      version:
+                        description: |-
+                          Version is the Kubernetes version of the control plane. It fulfills Cluster API's control plane
+                          provider contract.
+                        type: string
                     type: object
                 type: object
             required:

exp/api/v1alpha1/azureasomanagedcontrolplane_types.go

@@ -31,6 +31,11 @@ type AzureASOManagedControlPlaneSpec struct {
 
 // AzureASOManagedControlPlaneStatus defines the observed state of AzureASOManagedControlPlane.
 type AzureASOManagedControlPlaneStatus struct {
+	// Version is the observed Kubernetes version of the control plane. It fulfills Cluster API's control
+	// plane provider contract.
+	//+optional
+	Version string `json:"version,omitempty"`
+
 	//+optional
 	Resources []ResourceStatus `json:"resources,omitempty"`
 

exp/api/v1alpha1/azureasomanagedcontrolplanetemplate_types.go

@@ -33,6 +33,11 @@ type AzureASOManagedControlPlaneResource struct {
 
 // AzureASOManagedControlPlaneTemplateResourceSpec defines the desired state of the templated resource.
 type AzureASOManagedControlPlaneTemplateResourceSpec struct {
+	// Version is the Kubernetes version of the control plane. It fulfills Cluster API's control plane
+	// provider contract.
+	//+optional
+	Version string `json:"version,omitempty"`
+
 	// Resources are embedded ASO resources to be managed by this resource.
 	//+optional
 	Resources []runtime.RawExtension `json:"resources,omitempty"`

exp/controllers/azureasomanagedcontrolplane_controller.go

@@ -206,6 +206,9 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileNormal(ctx context.Cont
 	}
 
 	asoManagedControlPlane.Status.ControlPlaneEndpoint = getControlPlaneEndpoint(managedCluster)
+	if managedCluster.Status.CurrentKubernetesVersion != nil {
+		asoManagedControlPlane.Status.Version = "v" + *managedCluster.Status.CurrentKubernetesVersion
+	}
 
 	return ctrl.Result{}, nil
 }

exp/controllers/azureasomanagedcontrolplane_controller_test.go

@@ -224,7 +224,8 @@ func TestAzureASOManagedControlPlaneReconcile(t *testing.T) {
 				Namespace: cluster.Namespace,
 			},
 			Status: asocontainerservicev1.ManagedCluster_STATUS{
-				Fqdn: ptr.To("endpoint"),
+				Fqdn:                     ptr.To("endpoint"),
+				CurrentKubernetesVersion: ptr.To("Current"),
 			},
 		}
 		asoManagedControlPlane := &infrav1exp.AzureASOManagedControlPlane{
@@ -275,6 +276,7 @@ func TestAzureASOManagedControlPlaneReconcile(t *testing.T) {
 
 		g.Expect(c.Get(ctx, client.ObjectKeyFromObject(asoManagedControlPlane), asoManagedControlPlane)).To(Succeed())
 		g.Expect(asoManagedControlPlane.Status.ControlPlaneEndpoint.Host).To(Equal("endpoint"))
+		g.Expect(asoManagedControlPlane.Status.Version).To(Equal("vCurrent"))
 	})
 
 	t.Run("successfully reconciles pause", func(t *testing.T) {

templates/cluster-template-aks-aso-clusterclass.yaml

@@ -77,6 +77,7 @@ spec:
         path: /spec/template/spec
         valueFrom:
           template: |
+            version: ${KUBERNETES_VERSION}
             resources:
             - apiVersion: containerservice.azure.com/v1api20231001
               kind: ManagedCluster