Merge pull request #6295 from sbueringer/pr-fix-apiversion-diff

k8s-ci-robot · web-flow · commit 8941f168e9b4 · 2022-03-15T05:54:11.000-07:00
🐛 topology: set apiVersion to avoid diff in patchHelper
diff --git a/internal/controllers/topology/cluster/cluster_controller.go b/internal/controllers/topology/cluster/cluster_controller.go
@@ -127,6 +127,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 		// Error reading the object - requeue the request.
 		return ctrl.Result{}, err
 	}
+	cluster.APIVersion = clusterv1.GroupVersion.String()
 	cluster.Kind = "Cluster"
 
 	// Return early, if the Cluster does not use a managed topology.

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re`
`127`	`127`	`// Error reading the object - requeue the request.`
`128`	`128`	`return ctrl.Result{}, err`
`129`	`129`	`}`
	`130`	`+ cluster.APIVersion = clusterv1.GroupVersion.String()`
`130`	`131`	`cluster.Kind = "Cluster"`
`131`	`132`
`132`	`133`	`// Return early, if the Cluster does not use a managed topology.`