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.

Sign up for GitHub

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

Jump to bottom

WINC-1053: [build] Update to 4.15 image and prep for 10.15.0 #1773

Merged
merged 3 commits into from Sep 12, 2023
Merged

WINC-1053: [build] Update to 4.15 image and prep for 10.15.0 #1773

merged 3 commits into from Sep 12, 2023

Conversation

mansikulkarni96
Copy link
Member

@mansikulkarni96 mansikulkarni96 commented Sep 8, 2023 •
edited

Update Dockerfiles to use 4.15 base image and prep for 10.15.0 release
This change bumps the operator and OCP version according to the WMCO 10.15.0 release.
Dockerfile and the annotations.yaml file will use v4.14 until v4.15 index images are CVP supported.

Commands ran: 'make bundle'

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 8, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 8, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@mansikulkarni96 mansikulkarni96 changed the title [build] Update Dockerfiles to use 4.15 base image WINC-1053: [build] Update Dockerfiles to use 4.15 base image Sep 8, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 8, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 8, 2023 •
edited by openshift-ci bot

@mansikulkarni96: This pull request references WINC-1053 which is a valid jira issue.

In response to this:

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.

@mansikulkarni96
Copy link
Member Author

/test images

1 similar comment
@mansikulkarni96
Copy link
Member Author

/test images

@mansikulkarni96 mansikulkarni96 changed the title WINC-1053: [build] Update Dockerfiles to use 4.15 base image WINC-1053: [build] Update to 4.15 image and prep for 10.15.0 Sep 8, 2023
mansikulkarni96
mansikulkarni96 commented Sep 8, 2023
View reviewed changes
bundle.Dockerfile
@@ -15,7 +15,7 @@ LABEL com.redhat.delivery.operator.bundle=true

# This second label tells the pipeline which versions of OpenShift the operator supports.
# This is used to control which index images should include this operator.
LABEL com.redhat.openshift.versions="=v4.13"
LABEL com.redhat.openshift.versions="=v4.14"
Copy link
Member Author

Choose a reason for hiding this comment

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

updating to 4.14 as 4.15 CVP index images are not yet available.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 8, 2023 •
edited by openshift-ci bot

@mansikulkarni96: This pull request references WINC-1053 which is a valid jira issue.

In response to this:

Update Dockerfiles to use 4.15 base image and prep for 10.15.0 release
This change bumps the operator and OCP version according to the WMCO 10.15.0 release.
Dockerfile and the annotations.yaml file will use v4.14 until v4.15 index images are CVP supported.

Commands ran: 'make bundle'

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.

@jrvaldes
Copy link
Contributor

jrvaldes commented Sep 8, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2023
aravindhp
aravindhp reviewed Sep 8, 2023
View reviewed changes
Makefile
@@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the WMCO_VERSION as arg of the bundle target (e.g make bundle WMCO_VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export WMCO_VERSION=0.0.2)
WMCO_VERSION ?= 9.0.0
WMCO_VERSION ?= 10.15.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this update be done using the hack script? Unless the script cannot handle the bump from 9.0.0 to 10.15.0.

Copy link
Member Author

Choose a reason for hiding this comment

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

yes the script needs to be updated now
cc: @wgahnagl

bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml
be run on OCP clusters. Windows instances can be added either by creating a [MachineSet](https://docs.openshift.com/container-platform/4.14/machine_management/creating_machinesets/creating-machineset-aws.html#machine-api-overview_creating-machineset-aws),
or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/4.14/windows_containers/byoh-windows-instance.html)
be run on OCP clusters. Windows instances can be added either by creating a [MachineSet](https://docs.openshift.com/container-platform/4.15/machine_management/creating_machinesets/creating-machineset-aws.html#machine-api-overview_creating-machineset-aws),
or by specifying existing instances through a [ConfigMap](https://docs.openshift.com/container-platform/4.15/windows_containers/byoh-windows-instance.html)
Copy link
Contributor

Choose a reason for hiding this comment

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

Need not be done in this PR but we should consider adding some verbiage about the versioning change.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp, mansikulkarni96

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 Sep 8, 2023
@aravindhp
Copy link
Contributor

/test images

@mansikulkarni96 mansikulkarni96 marked this pull request as ready for review September 8, 2023 19:37
@mansikulkarni96
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 8, 2023
@saifshaikh48
Copy link
Contributor

/lgtm

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 080e8af and 2 for PR HEAD 8d3c252 in total

@sebsoto
Copy link
Contributor

sebsoto commented Sep 11, 2023

/lgtm

@mansikulkarni96
Copy link
Member Author

/hold
hack script needs to be fixed for the new versioning.

@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 Sep 11, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2023
@mansikulkarni96 mansikulkarni96 marked this pull request as draft September 11, 2023 14:52
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 11, 2023
@mansikulkarni96
[hack] Update regex for new version
58bea6f 
This commit updates the regex to correctly
grep the entire version present in the
operator.pacakge.yaml. Without this change,
the command returned v10.15 instead of v10.15.0.
The command has been adjusted to work with
previous as well as new versioning.
@mansikulkarni96
[bundle] Prep for 10.15.0 release
4b33191 
This change bumps the operator and OCP version
according to the WMCO 10.15.0 release.
Dockerfile and the annotations.yaml file will
use v4.14 until v4.15 index images are CVP supported.

Commands ran: 'make bundle'
@mansikulkarni96
[build] Update Dockerfiles to use 4.15 base image
69ad45e
jrvaldes
jrvaldes reviewed Sep 11, 2023
View reviewed changes
Copy link
Contributor

@jrvaldes jrvaldes left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2023
@mansikulkarni96
Copy link
Member Author

/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 Sep 11, 2023
@mansikulkarni96 mansikulkarni96 marked this pull request as ready for review September 11, 2023 16:00
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 11, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 080e8af and 2 for PR HEAD 69ad45e in total

@mansikulkarni96
Copy link
Member Author

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 12, 2023

@mansikulkarni96: 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-merge-robot openshift-merge-robot merged commit b610d83 into openshift:master Sep 12, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrvaldes jrvaldes jrvaldes left review comments

@aravindhp aravindhp Awaiting requested review from aravindhp

@sebsoto sebsoto Awaiting requested review from sebsoto

Assignees

@sebsoto sebsoto

@saifshaikh48 saifshaikh48

@jrvaldes jrvaldes

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@mansikulkarni96 @openshift-ci-robot @jrvaldes @aravindhp @saifshaikh48 @sebsoto @openshift-merge-robot