Skip to content

Commit

Permalink
topology controller should takeover ownership for fields at clusterCl…
Browse files Browse the repository at this point in the history
…ass.spec.topology
  • Loading branch information
chrischdi committed Jun 25, 2022
1 parent f4b2ddc commit 7726fcb
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions internal/controllers/topology/cluster/reconcile_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ func (r *Reconciler) reconcileCluster(ctx context.Context, s *scope.Scope) error
// Check differences between current and desired state, and eventually patch the current object.
patchHelper, err := r.patchHelperFactory(ctx, s.Current.Cluster, s.Desired.Cluster, structuredmerge.IgnorePaths{
{"spec", "controlPlaneEndpoint"}, // this is a well known field that is managed by the Cluster controller, topology should not express opinions on it.
{"spec", "topology"}, // this is a well known part read as input for the topology controller, topology should not try to patch variables on it.
})
if err != nil {
return errors.Wrapf(err, "failed to create patch helper for %s", tlog.KObj{Obj: s.Current.Cluster})
Expand Down

0 comments on commit 7726fcb

Please sign in to comment.