Skip to content
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.

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

WINC-807: Add OpenShift versions annotation to bundle metadata and prep for 6.0.0 #1088

Merged
merged 3 commits into from Jun 14, 2022

Conversation

saifshaikh48
Copy link
Contributor

In order to properly control operator version availability in the OperatorHub
catalog on different OCP versions, this ticket annotates our bundle image
with a specific OCP version as per OpenShift docs. This, in conjunction with
setting the label in the bundle.Dockerfile, maintains WMCO major version
availability is properly tied in 1:1 mapping with OCP versions.

This PR also bumps the WMCO and OCP version number in prep for the 6.0.0 release.

@openshift-ci openshift-ci bot requested review from sebsoto and selansen June 3, 2022 13:31
@alinaryan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2022
@jrvaldes
Copy link
Contributor

jrvaldes commented Jun 3, 2022

/lgtm

* [WMCO prerequisites](https://docs.openshift.com/container-platform/4.10/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
* A Red Hat OpenShift Container Platform for Windows Containers [subscription](https://access.redhat.com/support/policy/updates/openshift#windows)
* OCP 4.11 cluster running on Azure, AWS or vSphere configured with hybrid OVN Kubernetes networking
* [WMCO prerequisites](https://docs.openshift.com/container-platform/latest/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
Copy link
Member

Choose a reason for hiding this comment

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

What was the thought around switching this from a specific version to latest? In the future, is there a desire for a user installing 4.11 to be linked to the 4.12 prerequisites, for example?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was thinking of reducing the number of places to change the version going forward, but you bring up a good point. Pointing to newer docs may be confusing. I'll keep this versioned.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There were a couple other references to latest pages in the CSV. I changed those to be versioned too.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2022
@saifshaikh48
Copy link
Contributor Author

/hold

CI blocked by SSH connectivity issue

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2022
@alinaryan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2022
* OCP 4.10 cluster running on Azure, AWS or vSphere configured with hybrid OVN Kubernetes networking
* [WMCO prerequisites](https://docs.openshift.com/container-platform/4.10/windows_containers/understanding-windows-container-workloads.html#wmco-prerequisites__understanding-windows-container-workloads)
* A Red Hat OpenShift Container Platform for Windows Containers [subscription](https://access.redhat.com/support/policy/updates/openshift#windows)
* OCP 4.11 cluster running on Azure, AWS or vSphere configured with hybrid OVN Kubernetes networking
Copy link
Contributor

Choose a reason for hiding this comment

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

There is still a ref to 4.6 in line #138. BTW, the troubleshooting page is missing in 4.10 docs.

Copy link
Member

Choose a reason for hiding this comment

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

Nice catch. And 4.6 on line #48.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

BTW, the troubleshooting page is missing in 4.10 docs

cc: @mburke5678

https://docs.openshift.com/container-platform/4.10/support/troubleshooting/troubleshooting-windows-container-workload-issues.html doesn't seem to exist but works fine for 4.9 and prior.

Copy link
Contributor

Choose a reason for hiding this comment

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

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2022
@selansen
Copy link
Contributor

selansen commented Jun 4, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2022
To properly control WMCO availability in the OperatorHub catalog on different
OCP versions, we need to annotate our bundle image with a specific OCP version.
This maintains a 1:1 mapping, WMCO major version to OCP minor version.
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 6, 2022
@@ -1,7 +1,7 @@
# Setup hybrid OVNKubernetes cluster

This guide assumes the user has installed current versions of the OpenShift installer (`openshift-install`) and client (`oc`) binaries.
Please refer to the [official OpenShift Container Platform documentation](https://docs.openshift.com/container-platform/4.5/welcome/index.html) for details.
Please refer to the [official OpenShift Container Platform documentation](https://docs.openshift.com/container-platform/latest/welcome/index.html) for details.
Copy link
Contributor

Choose a reason for hiding this comment

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

you're setting some of these to latest and some to 4.11.
personally, i'd prefer all to latest as that would save us time in the future, and whoever clicks the link can just select their version on the doc page

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here's my take: the ones in the CSV are versioned since it's tied to a specific WMCO release, the ones in our internal docs only are latest

Copy link
Member

@mtnbikenc mtnbikenc left a comment

Choose a reason for hiding this comment

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

A few minor updates.

Changed old version references to `latest` so we don't need to keep
maintaining the links.
@jrvaldes
Copy link
Contributor

jrvaldes commented Jun 7, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 7, 2022
@sebsoto
Copy link
Contributor

sebsoto commented Jun 7, 2022

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 7, 2022

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 7, 2022
@alinaryan
Copy link
Contributor

/lgtm

@mansikulkarni96
Copy link
Member

/retest

@selansen
Copy link
Contributor

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 13, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 14, 2022

@saifshaikh48: 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-ci openshift-ci bot merged commit bd4e6af into openshift:master Jun 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants