WINC-803: Update correct WMCO subscription info #1044

selansen · 2022-04-30T03:45:15Z

This commit aims to address WINC-803 issue. We need to update
OpenShift Container Platform for Windows Containers subscription
as subscription info to be in sync with rlease and support docs.

Signed-off-by: selansen esiva@redhat.com

selansen · 2022-04-30T03:46:08Z

/approve cancel

sebsoto · 2022-05-02T13:32:56Z

config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml

-    Usage of this operator requires a Red Hat OpenShift subscription. Users looking to deploy Windows containers workloads in
-    production clusters should acquire a subscription before attempting to install this operator. Users without a subscription
-    can try the community operator, a distribution which lacks official support.
+    Usage of this operator requires a OpenShift Container Platform for Windows Containers subscription. Users looking to


a OpenShift -> an OpenShift

jrvaldes · 2022-05-02T13:50:43Z

config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml

@@ -27,12 +27,13 @@ spec:
    or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/latest/windows_containers/configuring-byoh-windows-instance.html)


@selansen , You may need to run make bundle to reflect the changes in the bundle.

why do I need to run make bundle? Looked into previous changes in the same file, haven't noticed anyone ran make bundle for this file change. Am I missing anything?

I am not creating any bundle image.

why do I need to run make bundle? Looked into previous changes in the same file, haven't noticed anyone ran make bundle for this file change. Am I missing anything?

make bundle will apply the changes in the bundle CSV, here. Otherwise won't take effect.

For references, you can take a look at #780.

This will be done as part of release prep, right? I am not seeing previous commits in CSV that had run make bundle. That's why I am confused if I have to do it for this PR or should we do it as part of release prep?

This will be done as part of release prep, right?

Yes, and running make bundle now will apply the changes in the bundle CSV.

jrvaldes · 2022-05-03T13:07:24Z

bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml

@@ -11,9 +11,8 @@ metadata:
    olm.skipRange: '>=4.0.0 <5.0.0'


PR title should be prefixed with the Jira id (WINC-803).

Also, there is a typo in the commit message: s/rlease/release

I suggest using [bundle] as the sub-component in the first line of the commit

jrvaldes · 2022-05-03T13:10:53Z

bundle/tests/scorecard/config.yaml

  - entrypoint:
    - scorecard-test
    - olm-bundle-validation
    image: quay.io/operator-framework/scorecard-test:v1.5.0
    labels:
      suite: olm
      test: olm-bundle-validation-test
-    storage:


@selansen These changes are not related and should be reverted.

jrvaldes · 2022-05-03T13:11:05Z

config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml

@@ -11,8 +11,7 @@ metadata:
    olm.skipRange: '>=4.0.0 <5.0.0'
    operatorframework.io/cluster-monitoring: "true"
    operatorframework.io/suggested-namespace: openshift-windows-machine-config-operator
-    operators.openshift.io/valid-subscription: '["Red Hat OpenShift support for Windows
-      Containers"]'


jrvaldes · 2022-05-03T13:11:21Z

config/rbac/role.yaml

@@ -189,11 +197,3 @@ rules:
  - securitycontextconstraints
  verbs:
  - use
- apiGroups:


selansen · 2022-05-04T15:32:00Z

$ operator-sdk version
operator-sdk version: "v1.15.0", commit: "f6326e832a8a5e5453d0ad25e86714a0de2c0fc8", kubernetes version: "1.21", go version: "go1.16.10", GOOS: "linux", GOARCH: "amd64"

saifshaikh48 · 2022-05-04T17:24:05Z

bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml


    ### Pre-requisites
-    * A Red Hat OpenShift subscription
+    * A Red Hat OpenShift Container Platform for Windows Containers subscription


Would it help to add a link to the support page here: https://access.redhat.com/support/policy/updates/openshift#windows

sebsoto · 2022-05-04T17:24:39Z

/approve

openshift-ci · 2022-05-04T17:25:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

This commit aims to address WINC-803 issue. We need to update OpenShift Container Platform for Windows Containers subscription as subscription info to be in sync with release and support docs. Signed-off-by: selansen <esiva@redhat.com>

openshift-ci · 2022-05-04T18:07:57Z

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

selansen · 2022-05-04T18:08:33Z

/cherry-pick release-4.10

selansen · 2022-05-04T18:09:07Z

/cherry-pick community-4.10

openshift-cherrypick-robot · 2022-05-04T18:09:12Z

@selansen: new pull request created: #1053

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-05-04T18:09:44Z

@selansen: #1044 failed to apply on top of branch "community-4.10":

Applying: Update correct WMCO subscription info
Using index info to reconstruct a base tree...
M	bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
M	config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml
Auto-merging bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/windows-machine-config-operator.clusterserviceversion.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 Update correct WMCO subscription info
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 community-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.

selansen · 2022-05-04T18:12:54Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2022-05-04T18:13:31Z

@selansen: #1044 failed to apply on top of branch "release-4.9":

Applying: Update correct WMCO subscription info
Using index info to reconstruct a base tree...
M	bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
M	config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml
M	config/rbac/role.yaml
Falling back to patching base and 3-way merge...
Auto-merging config/rbac/role.yaml
Auto-merging config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml
Auto-merging bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/windows-machine-config-operator.clusterserviceversion.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 Update correct WMCO subscription info
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.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-ci bot requested review from mansikulkarni96 and sebsoto April 30, 2022 03:45

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

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

sebsoto requested changes May 2, 2022

View reviewed changes

jrvaldes reviewed May 2, 2022

View reviewed changes

selansen force-pushed the winc_803 branch 2 times, most recently from 48dc535 to 671f01b Compare May 2, 2022 22:11

jrvaldes reviewed May 3, 2022

View reviewed changes

config/rbac/role.yaml

@@ -189,11 +197,3 @@ rules:

- securitycontextconstraints

verbs:

- use

- apiGroups:

Copy link

Contributor

jrvaldes May 3, 2022

Choose a reason for hiding this comment

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

Revert

selansen force-pushed the winc_803 branch from 671f01b to da528da Compare May 4, 2022 12:58

selansen changed the title ~~[config] Update correct WMCO subscription info~~ WINC-803: Update correct WMCO subscription info May 4, 2022

selansen force-pushed the winc_803 branch 4 times, most recently from 4101287 to 7d0eb14 Compare May 4, 2022 17:17

saifshaikh48 reviewed May 4, 2022

View reviewed changes

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

[bundle] Update correct WMCO subscription info

b44a63f

This commit aims to address WINC-803 issue. We need to update OpenShift Container Platform for Windows Containers subscription as subscription info to be in sync with release and support docs. Signed-off-by: selansen <esiva@redhat.com>

selansen force-pushed the winc_803 branch from 7d0eb14 to b44a63f Compare May 4, 2022 17:54

selansen merged commit f409122 into openshift:master May 4, 2022

openshift-cherrypick-robot mentioned this pull request May 4, 2022

[release-4.10] WINC-803: Update correct WMCO subscription info #1053

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WINC-803: Update correct WMCO subscription info #1044

WINC-803: Update correct WMCO subscription info #1044

selansen commented Apr 30, 2022 •

edited by openshift-ci bot

selansen commented Apr 30, 2022

sebsoto May 2, 2022

jrvaldes May 2, 2022

selansen May 2, 2022

selansen May 2, 2022

jrvaldes May 2, 2022

selansen May 2, 2022

jrvaldes May 2, 2022

jrvaldes May 3, 2022

jrvaldes May 3, 2022

jrvaldes May 3, 2022

jrvaldes May 3, 2022

jrvaldes May 3, 2022

selansen commented May 4, 2022

saifshaikh48 May 4, 2022

sebsoto commented May 4, 2022

openshift-ci bot commented May 4, 2022

openshift-ci bot commented May 4, 2022

selansen commented May 4, 2022

selansen commented May 4, 2022

openshift-cherrypick-robot commented May 4, 2022

openshift-cherrypick-robot commented May 4, 2022

selansen commented May 4, 2022

openshift-cherrypick-robot commented May 4, 2022

		@@ -27,12 +27,13 @@ spec:
		or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/latest/windows_containers/configuring-byoh-windows-instance.html)

WINC-803: Update correct WMCO subscription info #1044

WINC-803: Update correct WMCO subscription info #1044

Conversation

selansen commented Apr 30, 2022 • edited by openshift-ci bot

selansen commented Apr 30, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

selansen commented May 4, 2022

Choose a reason for hiding this comment

sebsoto commented May 4, 2022

openshift-ci bot commented May 4, 2022

openshift-ci bot commented May 4, 2022

selansen commented May 4, 2022

selansen commented May 4, 2022

openshift-cherrypick-robot commented May 4, 2022

openshift-cherrypick-robot commented May 4, 2022

selansen commented May 4, 2022

openshift-cherrypick-robot commented May 4, 2022

selansen commented Apr 30, 2022 •

edited by openshift-ci bot