karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: remove the setTransitionTime method from the cluster status controller 

Signed-off-by: xigang <wangxigang2014@gmail.com>
This commit is contained in:
xigang 2023-03-22 15:21:37 +08:00
parent a14d64f055
commit 4c38c4e6c1
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/controllers/status/cluster_status_controller.go
View File

@ -177,7 +177,6 @@ func (c *ClusterStatusController) syncClusterStatus(cluster *clusterv1alpha1.Clu
if !online && readyCondition.Status != metav1.ConditionTrue { if !online && readyCondition.Status != metav1.ConditionTrue {
klog.V(2).Infof("Cluster(%s) still offline after %s, ensuring offline is set.", klog.V(2).Infof("Cluster(%s) still offline after %s, ensuring offline is set.",
cluster.Name, c.ClusterFailureThreshold.Duration) cluster.Name, c.ClusterFailureThreshold.Duration)
setTransitionTime(cluster.Status.Conditions, readyCondition)
meta.SetStatusCondition(&currentClusterStatus.Conditions, *readyCondition) meta.SetStatusCondition(&currentClusterStatus.Conditions, *readyCondition)
return c.updateStatusIfNeeded(cluster, currentClusterStatus) return c.updateStatusIfNeeded(cluster, currentClusterStatus)
} }
@ -202,7 +201,6 @@ func (c *ClusterStatusController) syncClusterStatus(cluster *clusterv1alpha1.Clu
} }
} }
setTransitionTime(currentClusterStatus.Conditions, readyCondition)
meta.SetStatusCondition(&currentClusterStatus.Conditions, *readyCondition) meta.SetStatusCondition(&currentClusterStatus.Conditions, *readyCondition)
return c.updateStatusIfNeeded(cluster, currentClusterStatus) return c.updateStatusIfNeeded(cluster, currentClusterStatus)
@ -254,7 +252,6 @@ func (c *ClusterStatusController) setCurrentClusterStatus(clusterClient *util.Cl
func (c *ClusterStatusController) setStatusCollectionFailedCondition(cluster *clusterv1alpha1.Cluster, currentClusterStatus clusterv1alpha1.ClusterStatus, message string) (controllerruntime.Result, error) { func (c *ClusterStatusController) setStatusCollectionFailedCondition(cluster *clusterv1alpha1.Cluster, currentClusterStatus clusterv1alpha1.ClusterStatus, message string) (controllerruntime.Result, error) {
readyCondition := util.NewCondition(clusterv1alpha1.ClusterConditionReady, statusCollectionFailed, message, metav1.ConditionFalse) readyCondition := util.NewCondition(clusterv1alpha1.ClusterConditionReady, statusCollectionFailed, message, metav1.ConditionFalse)
setTransitionTime(cluster.Status.Conditions, &readyCondition)
meta.SetStatusCondition(&currentClusterStatus.Conditions, readyCondition) meta.SetStatusCondition(&currentClusterStatus.Conditions, readyCondition)
return c.updateStatusIfNeeded(cluster, currentClusterStatus) return c.updateStatusIfNeeded(cluster, currentClusterStatus)
} }
@ -420,15 +417,6 @@ func generateReadyCondition(online, healthy bool) metav1.Condition {
return util.NewCondition(clusterv1alpha1.ClusterConditionReady, clusterReady, clusterHealthy, metav1.ConditionTrue) return util.NewCondition(clusterv1alpha1.ClusterConditionReady, clusterReady, clusterHealthy, metav1.ConditionTrue)
} }
func setTransitionTime(existingConditions []metav1.Condition, newCondition *metav1.Condition) {
// preserve the last transition time if the status of given condition not changed
if existingCondition := meta.FindStatusCondition(existingConditions, newCondition.Type); existingCondition != nil {
if existingCondition.Status == newCondition.Status {
newCondition.LastTransitionTime = existingCondition.LastTransitionTime
}
}
}
func getKubernetesVersion(clusterClient *util.ClusterClient) (string, error) { func getKubernetesVersion(clusterClient *util.ClusterClient) (string, error) {
clusterVersion, err := clusterClient.KubeClient.Discovery().ServerVersion() clusterVersion, err := clusterClient.KubeClient.Discovery().ServerVersion()
if err != nil { if err != nil {