KUBESAW-43: Replace the special ToolchainClusterCondition with the st…

…andard toolchain Condition (#416)

* KUBESAW-43: Replace the special ToolchainClusterCondition with the standard toolchain Condition

Signed-off-by: Feny Mehta <[email protected]>

* Updating condition type

Signed-off-by: Feny Mehta <[email protected]>

* removing the toolchaincluster special condition

Signed-off-by: Feny Mehta <[email protected]>

* review comments
Signed-off-by: Feny Mehta <[email protected]>

---------

Signed-off-by: Feny Mehta <[email protected]>
Co-authored-by: Francisc Munteanu <[email protected]>

api/v1alpha1/toolchaincluster_types.go

@@ -3,18 +3,13 @@ package v1alpha1
 // Most of the code was copied from the KubeFedCluster CRD of the KubeFed project https://github.com/kubernetes-sigs/kubefed
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type ToolchainClusterConditionType string
-
 // These are valid conditions of a cluster.
 const (
-	// ToolchainClusterReady means the cluster is ready to accept workloads.
-	ToolchainClusterReady ToolchainClusterConditionType = "Ready"
 	// ToolchainClusterOffline means the cluster is temporarily down or not reachable
-	ToolchainClusterOffline ToolchainClusterConditionType = "Offline"
+	ToolchainClusterOffline ConditionType = "Offline"
 
 	ToolchainClusterClusterReadyReason        = "ClusterReady"
 	ToolchainClusterClusterNotReadyReason     = "ClusterNotReady"
@@ -73,7 +68,7 @@ type LocalSecretReference struct {
 type ToolchainClusterStatus struct {
 	// Conditions is an array of current cluster conditions.
 	// +listType=atomic
-	Conditions []ToolchainClusterCondition `json:"conditions"`
+	Conditions []Condition `json:"conditions"`
 }
 
 //+kubebuilder:object:root=true
@@ -100,30 +95,6 @@ type ToolchainCluster struct {
 	Status ToolchainClusterStatus `json:"status,omitempty"`
 }
 
-// ToolchainClusterCondition describes current state of a cluster.
-// +k8s:openapi-gen=true
-type ToolchainClusterCondition struct {
-	// Type of cluster condition, Ready or Offline.
-	Type ToolchainClusterConditionType `json:"type"`
-	// Status of the condition, one of True, False, Unknown.
-	Status corev1.ConditionStatus `json:"status"`
-	// Last time the condition was checked.
-	// +optional
-	LastProbeTime metav1.Time `json:"lastProbeTime"`
-	// Last time the condition was updated
-	// +optional
-	LastUpdatedTime *metav1.Time `json:"lastUpdatedTime,omitempty"`
-	// Last time the condition transit from one status to another.
-	// +optional
-	LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"`
-	// (brief) reason for the condition's last transition.
-	// +optional
-	Reason string `json:"reason,omitempty"`
-	// Human readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message,omitempty"`
-}
-
 //+kubebuilder:object:root=true
 
 // ToolchainClusterList contains a list of ToolchainCluster