Bug 1724833: Cleanup 4.1 manifest content

[bparees]

aligning w/ similar changes in master: #206

patch manager: there is no master BZ associated w/ this change because this is cleaning up issues that were specific to the 4.1 resource files.

[bparees]

Now that the ART pipeline is doing proper substitution there should be no need to leave the "4.1.2" values in place. Hoping to avoid some future confusion by setting these to 4.1.0.

@jcantrill @ewolinetz ptal. i guess i'll need to get a BZ created to get this cherry-pick approved.

@sosiouxme @adammhaile can you confirm this is safe to do in the 4.1 stream at this point?

[ewolinetz]

this is looks like its basically a cherrypick
/lgtm

[openshift-ci-robot]

@bparees: This pull request references an invalid Bugzilla bug:

• expected the bug to target the "4.1.z" release, but it targets "---" instead

In response to this:

bug 1724833: cleanup 4.1 manifest content

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bparees]

/bugzilla refresh

[openshift-ci-robot]

@bparees: This pull request references a valid Bugzilla bug. The bug has been moved to the POST state.

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bparees]

/hold
need ART to confirm these changes make sense for 4.1 at this point (going back to using 4.1.0 as the search text, not 4.1.2) @sosiouxme @adammhaile

[bparees]

testing something....
/label cherry-pick-approved

[sosiouxme]

LGTM

[bparees]

/hold cancel
@sosiouxme reviewed in slack (thanks!)

[jwforres]

no version could ever match this range, i know this is just the placeholder, but is it going to cause the semver library that OLM is using to be upset, or is it not going to care. I just don't want to break the logging CI if OLM will wind up choking on this.

[bparees]

@ecordell can you weigh in?

[ecordell]

import (
	"github.com/blang/semver"
	"github.com/stretchr/testify/require"
)

func TestBlang(t *testing.T) {
	r, err := semver.ParseRange(">=4.1.0 <4.1.0")
	require.NoError(t, err)
	v, err := semver.ParseTolerant("4.1.0")
	require.NoError(t, err)
	require.False(t, r(v))
}

This test passes, so:

• the range will be parsed with no issues
• 4.1.0 will not match the range

[bparees]

so it sounds like this will work as is, however if someone wanted to use it to test upgrading from a true 4.1.0 operator, to a new operator they just built (using this CSV) they could not, they'd have to modify the CSV.

so i guess i'll just change this to "4.1.1" to make everyone's lives easier.

[bparees]

well, i take it back...i'd rather not do that unless it becomes necessary. Since it's not necessary currently, i'm going to suggest we proceed w/ what we've got. If this skipRange becomes problematic in the future for upgrade testing, we can revisit at that point.

[bparees]

/retest

[jwforres]

Ok all concerns were addressed on this, patch manager is @crawford this week. I'll let him make final call to approve it for merge.

[crawford]

@bparees I'm not familiar enough to understand what effect this is going to have (especially the strange semver range). Can you provide details in the commit message for me and future readers?

[bparees]

@crawford done.

[crawford]

/retitle Bug 1724833: Cleanup 4.1 manifest content

[crawford]

No content changes.

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, crawford, ewolinetz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [ewolinetz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-bot]

/retest

Please review the full test history for this PR and help us cut down flakes.