fix: revert condition handling to cluster-api

apis/cloud.redhat.com/v1alpha1/clowdapp_types.go

@@ -25,6 +25,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -490,23 +491,23 @@ type ClowdAppSpec struct {
 
 const (
 	// Ready means all the deployments are ready
-	DeploymentsReady string = "DeploymentsReady"
+	DeploymentsReady clusterv1.ConditionType = "DeploymentsReady"
 	// ReconciliationSuccessful represents status of successful reconciliation
-	ReconciliationSuccessful string = "ReconciliationSuccessful"
+	ReconciliationSuccessful clusterv1.ConditionType = "ReconciliationSuccessful"
 	// ReconciliationFailed means the reconciliation failed
-	ReconciliationFailed string = "ReconciliationFailed"
+	ReconciliationFailed clusterv1.ConditionType = "ReconciliationFailed"
 	// JobInvocationComplete means all the Jobs have finished
-	JobInvocationComplete string = "JobInvocationComplete"
+	JobInvocationComplete clusterv1.ConditionType = "JobInvocationComplete"
 )
 
 // ClowdAppStatus defines the observed state of ClowdApp
 type ClowdAppStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 	// ClowdEnvironmentStatus defines the observed state of ClowdEnvironment
-	Deployments AppResourceStatus  `json:"deployments,omitempty"`
-	Ready       bool               `json:"ready"`
-	Conditions  []metav1.Condition `json:"conditions,omitempty"`
+	Deployments AppResourceStatus     `json:"deployments,omitempty"`
+	Ready       bool                  `json:"ready"`
+	Conditions  []clusterv1.Condition `json:"conditions,omitempty"`
 }
 
 type AppResourceStatus struct {
@@ -547,11 +548,11 @@ func init() {
 	SchemeBuilder.Register(&ClowdApp{}, &ClowdAppList{})
 }
 
-func (i *ClowdApp) GetConditions() []metav1.Condition {
+func (i *ClowdApp) GetConditions() clusterv1.Conditions {
 	return i.Status.Conditions
 }
 
-func (i *ClowdApp) SetConditions(conditions []metav1.Condition) {
+func (i *ClowdApp) SetConditions(conditions clusterv1.Conditions) {
 	i.Status.Conditions = conditions
 }
 

apis/cloud.redhat.com/v1alpha1/clowdenvironment_types.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/RedHatInsights/rhc-osdk-utils/utils"
@@ -575,14 +576,14 @@ type MinioStatus struct {
 type ClowdEnvironmentStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	Conditions      []metav1.Condition `json:"conditions,omitempty"`
-	TargetNamespace string             `json:"targetNamespace,omitempty"`
-	Ready           bool               `json:"ready,omitempty"`
-	Deployments     EnvResourceStatus  `json:"deployments,omitempty"`
-	Apps            []AppInfo          `json:"apps,omitempty"`
-	Generation      int64              `json:"generation,omitempty"`
-	Hostname        string             `json:"hostname,omitempty"`
-	Prometheus      PrometheusStatus   `json:"prometheus,omitempty"`
+	Conditions      []clusterv1.Condition `json:"conditions,omitempty"`
+	TargetNamespace string                `json:"targetNamespace,omitempty"`
+	Ready           bool                  `json:"ready,omitempty"`
+	Deployments     EnvResourceStatus     `json:"deployments,omitempty"`
+	Apps            []AppInfo             `json:"apps,omitempty"`
+	Generation      int64                 `json:"generation,omitempty"`
+	Hostname        string                `json:"hostname,omitempty"`
+	Prometheus      PrometheusStatus      `json:"prometheus,omitempty"`
 }
 
 type EnvResourceStatus struct {
@@ -644,11 +645,11 @@ func init() {
 	SchemeBuilder.Register(&ClowdEnvironment{}, &ClowdEnvironmentList{})
 }
 
-func (i *ClowdEnvironment) GetConditions() []metav1.Condition {
+func (i *ClowdEnvironment) GetConditions() clusterv1.Conditions {
 	return i.Status.Conditions
 }
 
-func (i *ClowdEnvironment) SetConditions(conditions []metav1.Condition) {
+func (i *ClowdEnvironment) SetConditions(conditions clusterv1.Conditions) {
 	i.Status.Conditions = conditions
 }
 

apis/cloud.redhat.com/v1alpha1/clowdjobinvocation_types.go

@@ -26,6 +26,7 @@ import (
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/RedHatInsights/rhc-osdk-utils/utils"
@@ -138,7 +139,7 @@ type ClowdJobInvocationStatus struct {
 	Jobs []string `json:"jobs,omitempty"`
 	// JobMap is a map of the job names run by Job invocation and their outcomes
 	JobMap     map[string]JobConditionState `json:"jobMap"`
-	Conditions []metav1.Condition           `json:"conditions,omitempty"`
+	Conditions []clusterv1.Condition        `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -164,11 +165,11 @@ type ClowdJobInvocationList struct {
 	Items           []ClowdJobInvocation `json:"items"`
 }
 
-func (i *ClowdJobInvocation) GetConditions() []metav1.Condition {
+func (i *ClowdJobInvocation) GetConditions() clusterv1.Conditions {
 	return i.Status.Conditions
 }
 
-func (i *ClowdJobInvocation) SetConditions(conditions []metav1.Condition) {
+func (i *ClowdJobInvocation) SetConditions(conditions clusterv1.Conditions) {
 	i.Status.Conditions = conditions
 }