Add .status.versions.reconciled to runtime components (#530)

idlewis · web-flow · commit cbc3d2327aed · 2023-05-11T15:43:39.000-04:00
diff --git a/api/v1/runtimecomponent_types.go b/api/v1/runtimecomponent_types.go
@@ -370,6 +370,7 @@ type RuntimeComponentStatus struct {
 	Conditions     []StatusCondition `json:"conditions,omitempty"`
 	Endpoints      []StatusEndpoint  `json:"endpoints,omitempty"`
 	ImageReference string            `json:"imageReference,omitempty"`
+	Versions       StatusVersions    `json:"versions,omitempty"`
 
 	// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="Service Binding"
 	Binding *corev1.LocalObjectReference `json:"binding,omitempty"`
@@ -413,6 +414,10 @@ const (
 	StatusEndpointScopeInternal StatusEndpointScope = "Internal"
 )
 
+type StatusVersions struct {
+	Reconciled string `json:"reconciled,omitempty"`
+}
+
 // +kubebuilder:resource:path=runtimecomponents,scope=Namespaced,shortName=comp;comps
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
diff --git a/api/v1/runtimeoperation_types.go b/api/v1/runtimeoperation_types.go
@@ -41,6 +41,7 @@ type RuntimeOperationSpec struct {
 type RuntimeOperationStatus struct {
 	// +listType=atomic
 	Conditions []OperationStatusCondition `json:"conditions,omitempty"`
+	Versions   StatusVersions             `json:"versions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/rc.app.stacks_runtimecomponents.yaml b/bundle/manifests/rc.app.stacks_runtimecomponents.yaml
@@ -7014,6 +7014,11 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
diff --git a/bundle/manifests/rc.app.stacks_runtimeoperations.yaml b/bundle/manifests/rc.app.stacks_runtimeoperations.yaml
@@ -78,6 +78,11 @@ spec:
                   type: object
                 type: array
                 x-kubernetes-list-type: atomic
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
diff --git a/bundle/tests/scorecard/kuttl/basic/00-assert.yaml b/bundle/tests/scorecard/kuttl/basic/00-assert.yaml
@@ -10,3 +10,11 @@ status:
   replicas: 1
   readyReplicas: 1
   updatedReplicas: 1
+---
+apiVersion: rc.app.stacks/v1
+kind: RuntimeComponent
+metadata:
+  name: example-runtime-component
+status:
+  versions:
+    reconciled: 1.2.0
diff --git a/config/crd/bases/rc.app.stacks_runtimecomponents.yaml b/config/crd/bases/rc.app.stacks_runtimecomponents.yaml
@@ -7011,6 +7011,11 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
diff --git a/config/crd/bases/rc.app.stacks_runtimeoperations.yaml b/config/crd/bases/rc.app.stacks_runtimeoperations.yaml
@@ -75,6 +75,11 @@ spec:
                   type: object
                 type: array
                 x-kubernetes-list-type: atomic
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
diff --git a/controllers/runtimecomponent_controller.go b/controllers/runtimecomponent_controller.go
@@ -270,6 +270,7 @@ func (r *RuntimeComponentReconciler) Reconcile(ctx context.Context, req ctrl.Req
 				reqLogger.Error(err, "Failed to reconcile Knative Service")
 				return r.ManageError(err, common.StatusConditionTypeReconciled, instance)
 			}
+			instance.Status.Versions.Reconciled = appstacksutils.RCOOperandVersion
 			reqLogger.Info("Reconcile RuntimeComponent - completed")
 			return r.ManageSuccess(common.StatusConditionTypeReconciled, instance)
 		}
@@ -506,6 +507,7 @@ func (r *RuntimeComponentReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		reqLogger.V(1).Info(fmt.Sprintf("%s is not supported", prometheusv1.SchemeGroupVersion.String()))
 	}
 
+	instance.Status.Versions.Reconciled = appstacksutils.RCOOperandVersion
 	reqLogger.Info("Reconcile RuntimeComponent - completed")
 	return r.ManageSuccess(common.StatusConditionTypeReconciled, instance)
 }
diff --git a/controllers/runtimeoperation_controller.go b/controllers/runtimeoperation_controller.go
@@ -139,6 +139,7 @@ func (r *RuntimeOperationReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			Message: err.Error(),
 		}
 		instance.Status.Conditions = appstacksv1.SetOperationCondition(instance.Status.Conditions, c)
+		instance.Status.Versions.Reconciled = utils.RCOOperandVersion
 		r.Client.Status().Update(context.TODO(), instance)
 		return reconcile.Result{}, nil
 
@@ -150,6 +151,7 @@ func (r *RuntimeOperationReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	}
 
 	instance.Status.Conditions = appstacksv1.SetOperationCondition(instance.Status.Conditions, c)
+	instance.Status.Versions.Reconciled = utils.RCOOperandVersion
 	r.Client.Status().Update(context.TODO(), instance)
 	return reconcile.Result{}, nil
 }
diff --git a/internal/deploy/kubectl/runtime-component-crd.yaml b/internal/deploy/kubectl/runtime-component-crd.yaml
@@ -7013,6 +7013,11 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
@@ -13851,6 +13856,11 @@ spec:
                   type: object
                 type: array
                 x-kubernetes-list-type: atomic
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
diff --git a/internal/deploy/kustomize/daily/base/runtime-component-crd.yaml b/internal/deploy/kustomize/daily/base/runtime-component-crd.yaml
@@ -7013,6 +7013,11 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
@@ -13851,6 +13856,11 @@ spec:
                   type: object
                 type: array
                 x-kubernetes-list-type: atomic
+              versions:
+                properties:
+                  reconciled:
+                    type: string
+                type: object
             type: object
         type: object
     served: true
diff --git a/utils/utils.go b/utils/utils.go
@@ -42,6 +42,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
+const RCOOperandVersion = "1.2.0"
+
 var APIVersionNotFoundError = errors.New("APIVersion is not available")
 
 // CustomizeDeployment ...

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ type RuntimeOperationSpec struct {`
`41`	`41`	`type RuntimeOperationStatus struct {`
`42`	`42`	`// +listType=atomic`
`43`	`43`	Conditions []OperationStatusCondition `json:"conditions,omitempty"`
	`44`	+ Versions StatusVersions `json:"versions,omitempty"`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`// +kubebuilder:object:root=true`
Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ func (r *RuntimeComponentReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`270`	`270`	`reqLogger.Error(err, "Failed to reconcile Knative Service")`
`271`	`271`	`return r.ManageError(err, common.StatusConditionTypeReconciled, instance)`
`272`	`272`	`}`
	`273`	`+ instance.Status.Versions.Reconciled = appstacksutils.RCOOperandVersion`
`273`	`274`	`reqLogger.Info("Reconcile RuntimeComponent - completed")`
`274`	`275`	`return r.ManageSuccess(common.StatusConditionTypeReconciled, instance)`
`275`	`276`	`}`
`@@ -506,6 +507,7 @@ func (r *RuntimeComponentReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`506`	`507`	`reqLogger.V(1).Info(fmt.Sprintf("%s is not supported", prometheusv1.SchemeGroupVersion.String()))`
`507`	`508`	`}`
`508`	`509`
	`510`	`+ instance.Status.Versions.Reconciled = appstacksutils.RCOOperandVersion`
`509`	`511`	`reqLogger.Info("Reconcile RuntimeComponent - completed")`
`510`	`512`	`return r.ManageSuccess(common.StatusConditionTypeReconciled, instance)`
`511`	`513`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ func (r *RuntimeOperationReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`139`	`139`	`Message: err.Error(),`
`140`	`140`	`}`
`141`	`141`	`instance.Status.Conditions = appstacksv1.SetOperationCondition(instance.Status.Conditions, c)`
	`142`	`+ instance.Status.Versions.Reconciled = utils.RCOOperandVersion`
`142`	`143`	`r.Client.Status().Update(context.TODO(), instance)`
`143`	`144`	`return reconcile.Result{}, nil`
`144`	`145`
`@@ -150,6 +151,7 @@ func (r *RuntimeOperationReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`instance.Status.Conditions = appstacksv1.SetOperationCondition(instance.Status.Conditions, c)`
	`154`	`+ instance.Status.Versions.Reconciled = utils.RCOOperandVersion`
`153`	`155`	`r.Client.Status().Update(context.TODO(), instance)`
`154`	`156`	`return reconcile.Result{}, nil`
`155`	`157`	`}`