Skip to content

Conversation

@hexfusion
Copy link
Contributor

@hexfusion hexfusion commented May 3, 2024

This PR add the ability to upgrade an os image if it has already been pulled into local container storage. This functionality is behind PinnedImage feature gate. The advantage to this path is that before this change skopeo by default will make a call to the registry to pull the image during upgrade. That does not work for disconnected clusters.

@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 May 6, 2024
@hexfusion hexfusion changed the title try upgrading os image from local storage daemon: upgrade os image from local container storage if it exists May 6, 2024
@hexfusion hexfusion marked this pull request as ready for review May 6, 2024 15:14
@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 May 6, 2024
@hexfusion hexfusion changed the title daemon: upgrade os image from local container storage if it exists OCPBUGS-33248: daemon: upgrade os image from local container storage if it exists May 6, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 6, 2024
@openshift-ci-robot
Copy link
Contributor

@hexfusion: This pull request references Jira Issue OCPBUGS-33248, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This PR add the ability to upgrade an os image if it has already been pulled into local container storage. This functionality is gated behind PinnedImage gates.

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.

@openshift-ci openshift-ci bot requested review from sinnykumari and yuqi-zhang May 6, 2024 15:16
@openshift-ci-robot
Copy link
Contributor

@hexfusion: This pull request references Jira Issue OCPBUGS-33248, which is invalid:

  • expected the bug to target the "4.16.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

@hexfusion
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 6, 2024
@openshift-ci-robot
Copy link
Contributor

@hexfusion: This pull request references Jira Issue OCPBUGS-33248, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @siserafin

Details

In response to this:

/jira refresh

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.

@openshift-ci openshift-ci bot requested a review from siserafin May 6, 2024 15:23
@hexfusion hexfusion force-pushed the ostree branch 5 times, most recently from 514f87a to 0d21fd8 Compare May 6, 2024 15:56
@openshift-ci-robot
Copy link
Contributor

@hexfusion: This pull request references Jira Issue OCPBUGS-33248, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @siserafin

Details

In response to this:

This PR add the ability to upgrade an os image if it has already been pulled into local container storage. This functionality is gated behind PinnedImage gates. The advantage to this path is that prior to this change skopeo by default will make a call to the registry to pull the image during upgrade. That does not work for disconnected clusters.

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.

@siserafin
Copy link

siserafin commented May 7, 2024

Verified in a disconnected cluster.

  1. Mirror an os image
  2. Pull the image from the node
  3. Add the firewall rule to block the pulling from registry
    sudo iptables -A OUTPUT -p tcp --dport 443 -j DROP
  4. Trigger the os upgrade
rpm-ostree --experimental rebase ostree-unverified-image:containers-storage:registry.build03.ci.openshift.org/ci-ln-gv2713b/stable@sha256:fda7f7db7bed8d6691acc2dd9870d492995b6bae6354b17edb3537f2637e113a
Pulling manifest: ostree-unverified-image:containers-storage:registry.build03.ci.openshift.org/ci-ln-gv2713b/stable@sha256:fda7f7db7bed8d6691acc2dd9870d492995b6bae6354b17edb3537f2637e113a
Importing: ostree-unverified-image:containers-storage:registry.build03.ci.openshift.org/ci-ln-gv2713b/stable@sha256:fda7f7db7bed8d6691acc2dd9870d492995b6bae6354b17edb3537f2637e113a (digest: sha256:fda7f7db7bed8d6691acc2dd9870d492995b6bae6354b17edb3537f2637e113a)
ostree chunk layers already present: 36
ostree chunk layers needed: 15 (284.5?MB)
⠁ Staging deployment...                                                                                                                                                                                                                                                                                                                                                                               Staging deployment... done
Downgraded:
  container-selinux 3:2.231.0-1.rhaos4.16.el9 -> 3:2.229.0-1.rhaos4.16.el9
  cri-o 1.29.4-6.rhaos4.16.git0e93ae2.el9 -> 1.29.4-5.rhaos4.16.gitec19fc9.el9
  openshift-kubelet 4.16.0-202405062116.p0.g681e46b.assembly.stream.el9 -> 4.16.0-202404251943.p0.gd1ec84a.assembly.stream.el9
Changes queued for next boot. Run "systemctl reboot" to start a reboot

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label May 7, 2024
@rioliu-rh
Copy link

/assign @sinnykumari

Copy link
Contributor

@sinnykumari sinnykumari left a comment

Choose a reason for hiding this comment

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

one minor nit in case we want to address before merge, otherwise lgtm.

@hexfusion
Copy link
Contributor Author

/retest-required

1 similar comment
@hexfusion
Copy link
Contributor Author

/retest-required

@sinnykumari
Copy link
Contributor

/lgtm
/approve

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

openshift-ci bot commented Jun 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, sinnykumari

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 4, 2024
@hexfusion
Copy link
Contributor Author

/cherry-pick 4.16

@openshift-cherrypick-robot

@hexfusion: once the present PR merges, I will cherry-pick it on top of 4.16 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick 4.16

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-sigs/prow repository.

@openshift-cherrypick-robot

@hexfusion: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.16

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-sigs/prow repository.

@hexfusion
Copy link
Contributor Author

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 5, 2024

@hexfusion: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azure-ovn-upgrade-out-of-change 9fcd4b0 link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/e2e-aws-ovn-upgrade-out-of-change 9fcd4b0 link false /test e2e-aws-ovn-upgrade-out-of-change

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@sinnykumari
Copy link
Contributor

/test e2e-gcp-op

@openshift-merge-bot openshift-merge-bot bot merged commit 743162d into openshift:master Jun 5, 2024
@openshift-ci-robot
Copy link
Contributor

@hexfusion: Jira Issue OCPBUGS-33248: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-33248 has been moved to the MODIFIED state.

Details

In response to this:

This PR add the ability to upgrade an os image if it has already been pulled into local container storage. This functionality is behind PinnedImage feature gate. The advantage to this path is that before this change skopeo by default will make a call to the registry to pull the image during upgrade. That does not work for disconnected clusters.

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.

@openshift-cherrypick-robot

@hexfusion: cannot checkout 4.16: error checking out "4.16": exit status 1 error: pathspec '4.16' did not match any file(s) known to git

Details

In response to this:

/cherry-pick 4.16

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-sigs/prow repository.

@hexfusion hexfusion deleted the ostree branch June 5, 2024 17:44
@hexfusion
Copy link
Contributor Author

/cherry-pick release-4.16

@openshift-cherrypick-robot

@hexfusion: new pull request created: #4392

Details

In response to this:

/cherry-pick release-4.16

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-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-config-operator-container-v4.17.0-202406052200.p0.g743162d.assembly.stream.el9 for distgit ose-machine-config-operator.
All builds following this will include this PR.

@sinnykumari
Copy link
Contributor

Seeing if automation will kicks in for bug auto move
/jira refresh

@openshift-ci-robot
Copy link
Contributor

@sinnykumari: Jira Issue OCPBUGS-33248: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-33248 has been moved to the MODIFIED state.

Details

In response to this:

Seeing if automation will kicks in for bug auto move
/jira refresh

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.

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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants