Skip to content

Commit

Permalink
pkg/cvo: Drop the explicit 'upstream' from our replacement ClusterVer…
Browse files Browse the repository at this point in the history
…sion

Hopefully we never actually have to stuff a CVO-generated
ClusterVersion into the cluster; it's just for recovery after admins
accidentally delete their existing ClusterVersion.  But if we ever do
hit this code, we want to push it without spec.upstream, to allow
later ClusterVersion-consuming code to say "ah, user doesn't care
which upstream I use, so I'll use the best default I'm aware of".
This effectively pushes default choice from the CVO that creates the
ClusterVersion out to the CVO that consumes the ClusterVersion, and
that later CVO is almost certainly more current on which default is
best.

Similar to openshift/installer@c9095b3451
(data/manifests/bootkube/cvo-overrides: Drop the explicit upstream,
2020-08-28, openshift/installer#4112).
  • Loading branch information
wking committed Aug 20, 2021
1 parent 0ec39d9 commit b8975db
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion pkg/cvo/cvo.go
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,6 @@ func (optr *Operator) getOrCreateClusterVersion(ctx context.Context, enableDefau
Name: optr.name,
},
Spec: configv1.ClusterVersionSpec{
Upstream: upstream,
Channel: "fast",
ClusterID: configv1.ClusterID(id.String()),
},
Expand Down

0 comments on commit b8975db

Please sign in to comment.