Add Version to ROSA Control Plane Status

Author: PanSpagetka

config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml

@@ -911,8 +911,12 @@ spec:
                 description: Ready denotes that the ROSAControlPlane API Server is
                   ready to receive requests.
                 type: boolean
+              version:
+                description: OpenShift semantic version, for example "4.14.5".
+                type: string
             required:
             - ready
+            - version
             type: object
         type: object
     served: true

controlplane/rosa/api/v1beta2/rosacontrolplane_types.go

@@ -749,6 +749,9 @@ type RosaControlPlaneStatus struct {
 	// OIDCEndpointURL is the endpoint url for the managed OIDC provider.
 	OIDCEndpointURL string `json:"oidcEndpointURL,omitempty"`
 
+	// OpenShift semantic version, for example "4.14.5".
+	Version string `json:"version"`
+
 	// Available upgrades for the ROSA hosted control plane.
 	AvailableUpgrades []string `json:"availableUpgrades,omitempty"`
 }

controlplane/rosa/controllers/rosacontrolplane_controller.go

@@ -252,6 +252,7 @@ func (r *ROSAControlPlaneReconciler) reconcileNormal(ctx context.Context, rosaSc
 		rosaScope.ControlPlane.Status.ConsoleURL = cluster.Console().URL()
 		rosaScope.ControlPlane.Status.OIDCEndpointURL = cluster.AWS().STS().OIDCEndpointURL()
 		rosaScope.ControlPlane.Status.Ready = false
+		rosaScope.ControlPlane.Status.Version = rosa.RawVersionID(cluster.Version())
 
 		switch cluster.Status().State() {
 		case cmv1.ClusterStateReady:

exp/controllers/rosamachinepool_controller_test.go

@@ -145,8 +145,9 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 				},
 			},
 			Status: rosacontrolplanev1.RosaControlPlaneStatus{
-				Ready: true,
-				ID:    fmt.Sprintf("rosa-control-plane-%v", i),
+				Ready:   true,
+				ID:      fmt.Sprintf("rosa-control-plane-%v", i),
+				Version: "4.15.20",
 			},
 		}
 	}
@@ -370,6 +371,7 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 			// make Control Plane ready, can't do this duirng creation
 			mpPh, err := patch.NewHelper(cp, testEnv)
 			cp.Status.Ready = true
+			cp.Status.Version = cp.Spec.Version
 			g.Expect(mpPh.Patch(ctx, cp)).To(Succeed())
 			g.Expect(err).ShouldNot(HaveOccurred())
 
@@ -470,6 +472,7 @@ func TestRosaMachinePoolReconcile(t *testing.T) {
 		cpPh, err := patch.NewHelper(cp, testEnv)
 		cp.Status.Ready = true
 		cp.Status.ID = controlPlaneName
+		cp.Status.Version = cp.Spec.Version
 		g.Expect(cpPh.Patch(ctx, cp)).To(Succeed())
 		g.Expect(err).ShouldNot(HaveOccurred())