WINC-797: Add subscription annotation to CSV #1014

alinaryan · 2022-03-30T16:49:58Z

This PR adds a subscription annotation to our CSV to prepare for the new
gating validation being added by CVP. We will be unable to release without
it starting in April.

alinaryan · 2022-03-30T16:53:53Z

This will be backported to release 4.7.

saifshaikh48 · 2022-03-30T18:14:21Z

/lgtm

mansikulkarni96 · 2022-03-30T18:26:20Z

LGTM

jrvaldes · 2022-03-30T18:32:59Z

/lgtm

alinaryan · 2022-03-30T18:52:58Z

/cherry-pick release-4.10

openshift-cherrypick-robot · 2022-03-30T18:52:59Z

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

In response to this:

/cherry-pick release-4.10

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.

alinaryan · 2022-03-30T18:53:12Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2022-03-30T18:53:13Z

@alinaryan: 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.

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.

alinaryan · 2022-03-30T18:53:30Z

/cherry-pick release-4.8

openshift-cherrypick-robot · 2022-03-30T18:53:31Z

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

In response to this:

/cherry-pick release-4.8

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.

alinaryan · 2022-03-30T18:53:45Z

/cherry-pick release-4.7

openshift-cherrypick-robot · 2022-03-30T18:53:46Z

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

In response to this:

/cherry-pick release-4.7

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.

sebsoto · 2022-03-30T19:40:59Z

/approve

openshift-ci · 2022-03-30T19:41:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alinaryan, sebsoto

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~~ [sebsoto]

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

saifshaikh48 · 2022-03-30T20:59:54Z

/hold

Please make the change in the base CSV and run make build for the bundle changes

mansikulkarni96 · 2022-03-30T21:57:50Z

bundle/manifests/windows-machine-config-operator_v1_serviceaccount.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1


we cannot add service account file in bundle manifest, it causes issues with duplicate SA bundle validation in upgrade case.

alinaryan · 2022-04-01T17:44:53Z

/retest-required

openshift-bot · 2022-04-03T16:33:42Z

/retest-required

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

openshift-bot · 2022-04-03T17:21:43Z

/retest-required

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

openshift-bot · 2022-04-03T18:45:43Z

/retest-required

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

openshift-bot · 2022-04-03T20:45:41Z

/retest-required

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

openshift-bot · 2022-04-03T22:33:42Z

/retest-required

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

openshift-bot · 2022-04-03T23:33:44Z

/retest-required

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

mansikulkarni96 · 2022-04-03T23:41:31Z

/hold

alinaryan · 2022-04-04T15:15:57Z

do we need to backport to community release?

@selansen No, this is not needed for community.

alinaryan · 2022-04-04T16:00:02Z

/test platform-none-vsphere-e2e-operator

This commit adds a subscription annotation to our CSV to prepare for the new gating validation being added by CVP. Also ran: 'make bundle' and manually removed ':latest' from REPLACE_IMAGE

selansen · 2022-04-04T23:45:01Z

/lgtm

saifshaikh48 · 2022-04-05T18:17:21Z

/lgtm

saifshaikh48 · 2022-04-06T13:09:44Z

/unhold
/retest

openshift-bot · 2022-04-06T17:37:47Z

/retest-required

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

openshift-bot · 2022-04-06T19:27:48Z

/retest-required

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

openshift-ci · 2022-04-06T21:06:13Z

@alinaryan: all tests passed!

Full PR test history. Your PR dashboard.

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-cherrypick-robot · 2022-04-06T21:08:58Z

@alinaryan: new pull request created: #1022

In response to this:

/cherry-pick release-4.10

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 · 2022-04-06T21:09:36Z

@alinaryan: new pull request created: #1023

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.

openshift-cherrypick-robot · 2022-04-06T21:10:14Z

@alinaryan: new pull request created: #1024

In response to this:

/cherry-pick release-4.8

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 · 2022-04-06T21:10:51Z

@alinaryan: #1014 failed to apply on top of branch "release-4.7":

Applying: Add subscription annotation to CSV
Using index info to reconstruct a base tree...
A	bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
A	config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging deploy/olm-catalog/windows-machine-config-operator/manifests/windows-machine-config-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in deploy/olm-catalog/windows-machine-config-operator/manifests/windows-machine-config-operator.clusterserviceversion.yaml
CONFLICT (modify/delete): config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml deleted in HEAD and modified in Add subscription annotation to CSV. Version Add subscription annotation to CSV of config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add subscription annotation to CSV
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".

In response to this:

/cherry-pick release-4.7

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-ci bot requested review from mansikulkarni96 and selansen March 30, 2022 16:50

alinaryan changed the title ~~WINC-797 Add subscription annotation to CSV~~ WINC-797: Add subscription annotation to CSV Mar 30, 2022

openshift-ci bot assigned saifshaikh48 Mar 30, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 30, 2022

openshift-ci bot assigned jrvaldes Mar 30, 2022

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 30, 2022

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 30, 2022

alinaryan force-pushed the winc-797 branch from 2b2ee82 to 603cede Compare March 30, 2022 21:22

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 30, 2022

alinaryan force-pushed the winc-797 branch 2 times, most recently from 6f7db51 to 90c6d37 Compare March 30, 2022 21:52

mansikulkarni96 reviewed Mar 30, 2022

View reviewed changes

alinaryan force-pushed the winc-797 branch from 90c6d37 to ddea224 Compare April 1, 2022 15:46

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 3, 2022

alinaryan force-pushed the winc-797 branch from 1830bb0 to 6260977 Compare April 4, 2022 19:14

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 4, 2022

[bundle] Add subscription annotation to CSV

18390d0

This commit adds a subscription annotation to our CSV to prepare for the new gating validation being added by CVP. Also ran: 'make bundle' and manually removed ':latest' from REPLACE_IMAGE

alinaryan force-pushed the winc-797 branch from 6260977 to 18390d0 Compare April 4, 2022 19:18

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 4, 2022

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 6, 2022

openshift-merge-robot merged commit 16b8aa4 into openshift:master Apr 6, 2022

openshift-cherrypick-robot mentioned this pull request Apr 6, 2022

[release-4.10] WINC-797: Add subscription annotation to CSV #1022

Merged

openshift-cherrypick-robot mentioned this pull request Apr 6, 2022

[release-4.9] WINC-797: Add subscription annotation to CSV #1023

Merged

openshift-cherrypick-robot mentioned this pull request Apr 6, 2022

[release-4.8] WINC-797: Add subscription annotation to CSV #1024

Merged

WINC-797: Add subscription annotation to CSV #1014

WINC-797: Add subscription annotation to CSV #1014

Conversation

alinaryan commented Mar 30, 2022

alinaryan commented Mar 30, 2022

saifshaikh48 commented Mar 30, 2022

mansikulkarni96 commented Mar 30, 2022

jrvaldes commented Mar 30, 2022

alinaryan commented Mar 30, 2022

openshift-cherrypick-robot commented Mar 30, 2022

alinaryan commented Mar 30, 2022

openshift-cherrypick-robot commented Mar 30, 2022

alinaryan commented Mar 30, 2022

openshift-cherrypick-robot commented Mar 30, 2022

alinaryan commented Mar 30, 2022

openshift-cherrypick-robot commented Mar 30, 2022

sebsoto commented Mar 30, 2022

openshift-ci bot commented Mar 30, 2022

saifshaikh48 commented Mar 30, 2022

mansikulkarni96 Mar 30, 2022

Choose a reason for hiding this comment

alinaryan commented Apr 1, 2022

openshift-bot commented Apr 3, 2022

openshift-bot commented Apr 3, 2022

openshift-bot commented Apr 3, 2022

openshift-bot commented Apr 3, 2022

openshift-bot commented Apr 3, 2022

openshift-bot commented Apr 3, 2022

mansikulkarni96 commented Apr 3, 2022

alinaryan commented Apr 4, 2022 • edited

alinaryan commented Apr 4, 2022

selansen commented Apr 4, 2022

saifshaikh48 commented Apr 5, 2022

saifshaikh48 commented Apr 6, 2022

openshift-bot commented Apr 6, 2022

openshift-bot commented Apr 6, 2022

openshift-ci bot commented Apr 6, 2022

openshift-cherrypick-robot commented Apr 6, 2022

openshift-cherrypick-robot commented Apr 6, 2022

openshift-cherrypick-robot commented Apr 6, 2022

openshift-cherrypick-robot commented Apr 6, 2022

alinaryan commented Apr 4, 2022 •

edited