Bug 2037168: Remove incorrect cvo annotations

[kevinrizza]

The single-node-developer profile was ultimately not implemented, and as
a result is ultimately unnecessary. This commit removes it from all
manifests
see openshift/cluster-version-operator#685

Additionally, the ibm-cloud-managed annotation and self-managed
annotations are applied to both versions of the psm deployment manifest.
Since these are in conflict, in the future they could potentially cause
flapping by the CVO to apply both versions of the manifest to the
cluster.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2037168

[openshift-ci]

@kevinrizza: This pull request references Bugzilla bug 2037168, which is invalid:

• expected the bug to target the "4.10.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 2037168: Remove incorrect cvo annotations

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.

[kevinrizza]

/bugzilla refresh

[openshift-ci]

@kevinrizza: This pull request references Bugzilla bug 2037168, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.10.0) matches configured target release for branch (4.10.0)
• bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @jianzhangbjz

Details

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.

[timflannagan]

Why was this annotation removed as well?

[kevinrizza]

Because they're opposite profiles. The self managed profile (the default cvo profile) shouldn't apply to the manifests that are specifically just for the ibm manifests. Take a look at our other deployment manifests that specifically include them, this change just makes those match.

For the manifests where we just have one copy of the manifest, both annotations apply.

[dinhxuanvu]

/lgtm

[kevinrizza]

/cherry-pick release-4.9

[openshift-cherrypick-robot]

@kevinrizza: once the present PR merges, I will cherry-pick it on top of release-4.9 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.9

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.

[awgreene]

/retest

[awgreene]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, dinhxuanvu, kevinrizza

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [awgreene,dinhxuanvu,kevinrizza]

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-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-bot]

/retest-required

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

[openshift-ci]

@kevinrizza: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

[openshift-ci]

@kevinrizza: All pull requests linked via external trackers have merged:

• openshift/operator-framework-olm#238

Bugzilla bug 2037168 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2037168: Remove incorrect cvo annotations

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.

[openshift-cherrypick-robot]

@kevinrizza: #238 failed to apply on top of branch "release-4.9":

Applying: Bug 2037168: Remove incorrect cvo annotations
Using index info to reconstruct a base tree...
M	manifests/0000_50_olm_00-catalogsources.crd.yaml
M	manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
M	manifests/0000_50_olm_00-installplans.crd.yaml
A	manifests/0000_50_olm_00-olmconfigs.crd.yaml
M	manifests/0000_50_olm_00-operatorconditions.crd.yaml
M	manifests/0000_50_olm_00-operatorgroups.crd.yaml
M	manifests/0000_50_olm_00-operators.crd.yaml
M	manifests/0000_50_olm_00-subscriptions.crd.yaml
A	manifests/0000_50_olm_02-olmconfig.yaml
M	manifests/0000_90_olm_01-prometheus-rule.yaml
M	pkg/manifests/csv.yaml
M	scripts/generate_crds_manifests.sh
Falling back to patching base and 3-way merge...
Auto-merging staging/operator-lifecycle-manager/deploy/upstream/manifests/0.18.0/0000_50_olm_00-operatorconditions.crd.yaml
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/deploy/upstream/manifests/0.18.0/0000_50_olm_00-operatorconditions.crd.yaml
Auto-merging scripts/generate_crds_manifests.sh
Auto-merging pkg/manifests/csv.yaml
Auto-merging manifests/0000_90_olm_01-prometheus-rule.yaml
CONFLICT (modify/delete): manifests/0000_50_olm_02-olmconfig.yaml deleted in HEAD and modified in Bug 2037168: Remove incorrect cvo annotations. Version Bug 2037168: Remove incorrect cvo annotations of manifests/0000_50_olm_02-olmconfig.yaml left in tree.
Auto-merging manifests/0000_50_olm_00-subscriptions.crd.yaml
Auto-merging manifests/0000_50_olm_00-operators.crd.yaml
Auto-merging manifests/0000_50_olm_00-operatorgroups.crd.yaml
Auto-merging manifests/0000_50_olm_00-operatorconditions.crd.yaml
Auto-merging manifests/0000_50_olm_00-installplans.crd.yaml
Auto-merging manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
Auto-merging manifests/0000_50_olm_00-catalogsources.crd.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 2037168: Remove incorrect cvo annotations
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.9

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.