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

openshift/kubernetes: stop modifying machine-os-content #49156

Merged
merged 1 commit into from Mar 6, 2024

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Feb 22, 2024

That image isn't actually used in the cluster. We already have code in these same files to update the real image that gets used (rhel-coreos), so let's just drop these references.

See also openshift/kubernetes#1805 (comment) and following.

See also https://issues.redhat.com/browse/MCO-392.

That image isn't actually used in the cluster. We already have
code in these same files to update the real image that gets used
(`rhel-coreos`), so let's just drop these references.

See also openshift/kubernetes#1805 (comment)
and following.

See also https://issues.redhat.com/browse/MCO-392.
@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@jlebon: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-kubernetes-master-artifacts openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-configmap-scale openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-agnostic-ovn-cmd openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-crun-wasm openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-csi openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-disruptive openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-jenkins openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-multitenant openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-cgroupsv2 openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-crun openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-downgrade openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-fips openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-serial openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-ovn-upgrade openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-aws-single-node openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-azure openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-azure-ovn-upgrade openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-gcp openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-gcp-ovn-upgrade openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-metal-ipi openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-metal-ipi-ovn-dualstack openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-metal-ipi-ovn-ipv6 openshift/kubernetes presubmit Ci-operator config changed
pull-ci-openshift-kubernetes-master-e2e-openstack openshift/kubernetes presubmit Ci-operator config changed

A total of 118 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@sdodson
Copy link
Member

sdodson commented Feb 27, 2024

/pj-rehearse pull-ci-openshift-kubernetes-release-4.16-e2e-azure pull-ci-openshift-kubernetes-release-4.16-e2e-azure-ovn-upgrade pull-ci-openshift-kubernetes-release-4.16-e2e-gcp pull-ci-openshift-kubernetes-release-4.16-e2e-gcp-ovn-upgrade pull-ci-openshift-kubernetes-release-4.16-e2e-metal-ipipull-ci-openshift-kubernetes-release-4.16-e2e-vsphere

@sdodson
Copy link
Member

sdodson commented Feb 27, 2024

/lgtm
Just review the rehearsals and ack them to merge please.

@openshift-ci-robot
Copy link
Contributor

@sdodson: job(s): pull-ci-openshift-kubernetes-release-4.16-e2e-metal-ipipull-ci-openshift-kubernetes-release-4.16-e2e-vsphere either don't exist or were not found to be affected, and cannot be rehearsed

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2024
Copy link
Contributor

openshift-ci bot commented Feb 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlebon, sdodson

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 Feb 27, 2024
@jlebon
Copy link
Member Author

jlebon commented Feb 27, 2024

/pj-rehearse pull-ci-openshift-kubernetes-release-4.16-e2e-metal-ipi pull-ci-openshift-kubernetes-release-4.16-e2e-vsphere

@sdodson
Copy link
Member

sdodson commented Feb 27, 2024

/pj-rehearse pull-ci-openshift-kubernetes-release-4.16-e2e-gcp-ovn-upgrade pull-ci-openshift-kubernetes-release-4.16-e2e-azure pull-ci-openshift-kubernetes-release-4.16-e2e-azure-ovn-upgrade

One more try on those which either failed to even run or those that failed in testing. I don't think there's any concern here.

@soltysh
Copy link
Member

soltysh commented Feb 27, 2024

/hold
I still see machine-os-content being explicitly used in https://github.com/openshift/kubernetes/blob/master/openshift-hack/images/os/Dockerfile, so until that gets fixed this should not merge!

@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 Feb 27, 2024
@jlebon
Copy link
Member Author

jlebon commented Feb 27, 2024

/hold I still see machine-os-content being explicitly used in openshift/kubernetes@master/openshift-hack/images/os/Dockerfile, so until that gets fixed this should not merge!

See openshift/kubernetes#1805. What we're removing here is what will allow those references to get removed.

@jlebon
Copy link
Member Author

jlebon commented Feb 27, 2024

IOW, the jobs we're removing here are what's referencing the code you linked to. So it needs to go in first. That'll fix CI on openshift/kubernetes#1805 to then allow that to go in (see openshift/kubernetes#1805 (comment)).

@sdodson
Copy link
Member

sdodson commented Feb 28, 2024

@soltysh any way we could test for whatever problems the kube rebase ran into last time as soon as we land all of the changes? It'd be nice to confirm whatever problems we ran into aren't happening now in case we decide to revert.

@soltysh
Copy link
Member

soltysh commented Mar 6, 2024

This was discussed with @jlebon and @sdodson yesterday, we're going to merge these PRs one after the other (openshift/kubernetes#1805) to fix the situation.

/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 Mar 6, 2024
@soltysh
Copy link
Member

soltysh commented Mar 6, 2024

/pj-rehearse ack

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Mar 6, 2024
Copy link
Contributor

openshift-ci bot commented Mar 6, 2024

@jlebon: 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-bot openshift-merge-bot bot merged commit 8a8e5d9 into openshift:master Mar 6, 2024
22 checks passed
jlebon added a commit to jlebon/os that referenced this pull request Mar 7, 2024
This was previously enabled (openshift#1048, openshift#1374) and then disabled again (openshift#1084, openshift#1393).

The last time we tried it, the issue was that there were some references
remaining in openshift/kubernetes and openshift/release. Those have been
cleaned up now:

openshift/release#49156
openshift/kubernetes#1805

So... third time's the charm!
jlebon added a commit to jlebon/os that referenced this pull request Mar 7, 2024
This was previously enabled (openshift#1048, openshift#1374) and then disabled again (openshift#1084, openshift#1393).

The last time we tried it, the issue was that there were some references
remaining in openshift/kubernetes and openshift/release. Those have been
cleaned up now:

openshift/release#49156
openshift/kubernetes#1805

So... third time's the charm!
memodi pushed a commit to memodi/release that referenced this pull request Mar 14, 2024
)

That image isn't actually used in the cluster. We already have
code in these same files to update the real image that gets used
(`rhel-coreos`), so let's just drop these references.

See also openshift/kubernetes#1805 (comment)
and following.

See also https://issues.redhat.com/browse/MCO-392.
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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged
Projects
None yet
4 participants