Skip to content

pkg/cvo: Drop the explicit 'upstream' from our replacement ClusterVersion #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 8, 2021
Merged

pkg/cvo: Drop the explicit 'upstream' from our replacement ClusterVersion #640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions pkg/cvo/cvo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,11 +661,6 @@ func (optr *Operator) getOrCreateClusterVersion(ctx context.Context, enableDefau
return nil, false, nil
}

var upstream configv1.URL
if len(optr.defaultUpstreamServer) > 0 {
u := configv1.URL(optr.defaultUpstreamServer)
upstream = u
}
id, _ := uuid.NewRandom()

// XXX: generate ClusterVersion from options calculated above.
Expand All @@ -674,7 +669,6 @@ func (optr *Operator) getOrCreateClusterVersion(ctx context.Context, enableDefau
Name: optr.name,
},
Spec: configv1.ClusterVersionSpec{
Upstream: upstream,
Channel: "fast",
Copy link
Member

@LalatenduMohanty LalatenduMohanty Aug 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why can't we remove the fast channel as default?

Copy link
Member Author

@wking wking Aug 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's good to have a signal that this code is happening, because it's very serious admin errors or a bug when it trips. For example, we had rhbz#1708697, from the CVO racing cluster-bootstrap during install (fixed by telling the CVO not do push this default into the cluster during install).

Copy link
Member

@LalatenduMohanty LalatenduMohanty Aug 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can live with that.

ClusterID: configv1.ClusterID(id.String()),
},
Expand Down