MCO-392: openshift-hack/images/os: delete #1805
Conversation
openshift-ci-robot
added
the
backports/unvalidated-commits
jlebon
force-pushed
the
pr/native-layering
branch
from
08efb17
to
75a80cd
Compare
|
@jlebon: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
jlebon
force-pushed
the
pr/native-layering
branch
from
75a80cd
to
f4353ab
Compare
|
@jlebon: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
|
Surfacing some internal discussions. OK so after looking at this more:
One confusing difference is that the layering hack for Someone asked:
Yes, CI builds the RPMs from the PR and layers it onto RHCOS. The Dockerfile here does it on |
One way to confirm this is to look at the logs from #1790 some more.
Note the digest there (bc7967fc2d190b95e3c983c4ee6dcc3bc927968fc181cb69a755186170543f8a). In So the Then, looking at the journal for e.g. master-0, we can see when the MCO pivots RHCOS onto that image: Notably, we see the RPM diff: |
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.
|
Issues go stale after 90d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle stale |
openshift-ci
bot
added
the
lifecycle/stale
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.
jlebon
force-pushed
the
pr/native-layering
branch
from
f4353ab
to
692780f
Compare
|
@jlebon: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
jlebon
changed the title
|
OK, I've updated this now to just nuke that whole directory since it's no longer used. |
|
(This requires openshift/release#49156 to be clear.) |
This will sanity-check in a much more straight-forward way that the kubelet built from PRs is what's actually getting tested in CI. See also openshift#1805 (comment) and following.
This will sanity-check in a much more straight-forward way that the kubelet built from PRs is what's actually getting tested in CI. See also openshift#1805 (comment) and following.
All the logic there is geared towards `machine-os-content` which is no longer used at all in the cluster. Nowadays, the container to modify is `rhel-coreos`, which is what is already being done in CI: https://github.com/openshift/release/blob/463a8f244ba0f807e76e6fdf974f98d24efd1ced/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml#L87-L97
jlebon
force-pushed
the
pr/native-layering
branch
from
692780f
to
461eacd
Compare
|
@jlebon: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
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.
|
Now that openshift/release#49156 is in, CI here should pass. |
|
/retest |
|
/test unit |
|
/override ci/prow/unit |
|
@soltysh: Overrode contexts on behalf of soltysh: ci/prow/unit 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. |
|
@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-ci
bot
added
backports/validated-commits
soltysh
changed the title
openshift-ci-robot
added
the
jira/valid-reference
|
@jlebon: This pull request references MCO-392 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target either version "4.16." or "openshift-4.16.", but it targets "4.15.0" instead. 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 openshift-eng/jira-lifecycle-plugin repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jlebon, soltysh 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 |
openshift-ci
bot
added
the
approved
|
[ART PR BUILD NOTIFIER] This PR has been included in build openshift-enterprise-pod-container-v4.16.0-202403070215.p0.ga0beecc.assembly.stream.el9 for distgit openshift-enterprise-pod. |
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!
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!
) 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.
All the logic there is geared towards
machine-os-contentwhich is nolonger used at all in the cluster.
Nowadays, the container to modify is
rhel-coreos, which is what isalready being done in CI:
https://github.com/openshift/release/blob/463a8f244ba0f807e76e6fdf974f98d24efd1ced/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml#L87-L97