Deprecate cluster lists in precaching/backup status (#417)

openshift-kni · Jan 30, 2023 · d72dbe6 · d72dbe6
1 parent 5b9e141
commit d72dbe6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/api/v1alpha1/clustergroupupgrade_types.go b/api/v1alpha1/clustergroupupgrade_types.go
@@ -214,16 +214,18 @@ type PrecachingSpec struct {
 
 // PrecachingStatus defines the observed pre-caching status
 type PrecachingStatus struct {
-	Spec     *PrecachingSpec   `json:"spec,omitempty"`
-	Status   map[string]string `json:"status,omitempty"`
-	Clusters []string          `json:"clusters,omitempty"`
+	Spec   *PrecachingSpec   `json:"spec,omitempty"`
+	Status map[string]string `json:"status,omitempty"`
+	//+kubebuilder:deprecatedversion:warning="PrecachingStatus.Clusters is deprecated"
+	Clusters []string `json:"clusters,omitempty"`
 }
 
 // BackupStatus defines the observed backup status
 type BackupStatus struct {
 	StartedAt metav1.Time       `json:"startedAt,omitempty"`
 	Status    map[string]string `json:"status,omitempty"`
-	Clusters  []string          `json:"clusters,omitempty"`
+	//+kubebuilder:deprecatedversion:warning="BackupStatus.Clusters is deprecated"
+	Clusters []string `json:"clusters,omitempty"`
 }
 
 // ClusterGroupUpgradeStatus defines the observed state of ClusterGroupUpgrade

diff --git a/controllers/precache.go b/controllers/precache.go
@@ -211,7 +211,7 @@ func (r *ClusterGroupUpgradeReconciler) deployDependencies(
 	if err != nil {
 		return false, err
 	}
-	spec.ViewUpdateIntervalSec = utils.GetMCVUpdateInterval(len(clusterGroupUpgrade.Status.Precaching.Clusters))
+	spec.ViewUpdateIntervalSec = utils.GetMCVUpdateInterval(len(clusterGroupUpgrade.Status.Precaching.Status))
 	err = r.createResourcesFromTemplates(ctx, spec, precacheDependenciesViewTemplates)
 	if err != nil {
 		return false, err

diff --git a/controllers/precacheFsm.go b/controllers/precacheFsm.go
@@ -94,8 +94,6 @@ func (r *ClusterGroupUpgradeReconciler) precachingFsm(ctx context.Context,
 		clusterGroupUpgrade.Status.Precaching.Spec = &spec
 	}
 
-	clusterGroupUpgrade.Status.Precaching.Clusters = clusters
-
 	for _, cluster := range clusters {
 		var currentState string
 		var ok bool
@@ -225,7 +223,7 @@ func (r *ClusterGroupUpgradeReconciler) handleStarting(ctx context.Context,
 	case NoJobView:
 		data := templateData{
 			Cluster:               cluster,
-			ViewUpdateIntervalSec: utils.GetMCVUpdateInterval(len(clusterGroupUpgrade.Status.Precaching.Clusters)),
+			ViewUpdateIntervalSec: utils.GetMCVUpdateInterval(len(clusterGroupUpgrade.Status.Precaching.Status)),
 		}
 		err = r.createResourcesFromTemplates(ctx, &data, precacheJobView)
 		if err != nil {