Update spec.cluster stack only after after controlplane is initialized and after cluster upgrade

aniruddha2000 · janiskemper · commit c96d0792efa6 · 2024-06-24T16:25:24.000+02:00
Signed-off-by: Aniruddha Basak &lt;aniruddha.basak@syself.com&gt;
diff --git a/internal/controller/clusteraddon_controller.go b/internal/controller/clusteraddon_controller.go
@@ -293,7 +293,6 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 			}
 		}
 
-		clusterAddon.Spec.ClusterStack = cluster.Spec.Topology.Class
 		clusterAddon.Spec.Version = releaseAsset.Meta.Versions.Components.ClusterAddon
 
 		if clusterAddon.Status.Ready {
@@ -329,6 +328,8 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 			// clusterAddon.Spec.Version = metadata.Versions.Components.ClusterAddon
 			conditions.MarkTrue(clusterAddon, csov1alpha1.HelmChartAppliedCondition)
 
+			clusterAddon.Spec.ClusterStack = cluster.Spec.Topology.Class
+
 			// store the release kubernetes version and current hook
 			clusterAddon.Status.Ready = true
 
@@ -349,6 +350,11 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re
 			if shouldRequeue {
 				return reconcile.Result{RequeueAfter: 20 * time.Second}, nil
 			}
+
+		}
+
+		if clusterAddon.Spec.Hook == "AfterControlPlaneInitialized" || clusterAddon.Spec.Hook == "BeforeClusterUpgrade" {
+			clusterAddon.Spec.ClusterStack = cluster.Spec.Topology.Class
 		}
 
 		// Helm chart has been applied successfully

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,6 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`
`296`		`- clusterAddon.Spec.ClusterStack = cluster.Spec.Topology.Class`
`297`	`296`	`clusterAddon.Spec.Version = releaseAsset.Meta.Versions.Components.ClusterAddon`
`298`	`297`
`299`	`298`	`if clusterAddon.Status.Ready {`
`@@ -329,6 +328,8 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re`
`329`	`328`	`// clusterAddon.Spec.Version = metadata.Versions.Components.ClusterAddon`
`330`	`329`	`conditions.MarkTrue(clusterAddon, csov1alpha1.HelmChartAppliedCondition)`
`331`	`330`
	`331`	`+ clusterAddon.Spec.ClusterStack = cluster.Spec.Topology.Class`
	`332`	`+`
`332`	`333`	`// store the release kubernetes version and current hook`
`333`	`334`	`clusterAddon.Status.Ready = true`
`334`	`335`
`@@ -349,6 +350,11 @@ func (r *ClusterAddonReconciler) Reconcile(ctx context.Context, req reconcile.Re`
`349`	`350`	`if shouldRequeue {`
`350`	`351`	`return reconcile.Result{RequeueAfter: 20 * time.Second}, nil`
`351`	`352`	`}`
	`353`	`+`
	`354`	`+ }`
	`355`	`+`
	`356`	`+ if clusterAddon.Spec.Hook == "AfterControlPlaneInitialized" \|\| clusterAddon.Spec.Hook == "BeforeClusterUpgrade" {`
	`357`	`+ clusterAddon.Spec.ClusterStack = cluster.Spec.Topology.Class`
`352`	`358`	`}`
`353`	`359`
`354`	`360`	`// Helm chart has been applied successfully`