Skip to content

[release-4.17] OCPBUGS-55915: Fix containerd host.toml generation to work with mirrors using an org_name #2891

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
Open
wants to merge 4 commits into
base: release-4.17
Choose a base branch
from
Open

[release-4.17] OCPBUGS-55915: Fix containerd host.toml generation to work with mirrors using an org_name #2891

wants to merge 4 commits into from
+182 −44

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #2879

/assign sebsoto

sebsoto added 4 commits May 8, 2025 02:02
@sebsoto
Refactor containerd host.toml generation
788242a 
Refactors the code to make the test code readable.
@sebsoto
Harden image registry parsing
928228c 
Allows handling of image registries given via https:// , docker:// ,
or any other scheme. Before this change the parsing of images given in
these formats would fail unexpectedly and quietly.
@sebsoto
Allow use of org_path with mirrored images
a05e045 
Fixes the logic when adding mirrors with an optional org_path.
@sebsoto
Expand image mirroring documentation
b120940
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 8, 2025
Merged
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-55787 has been cloned as Jira Issue OCPBUGS-55915. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-55915: Fix containerd host.toml generation to work with mirrors using an org_name

In response to this:

This is an automated cherry-pick of #2879

/assign sebsoto

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 changed the title [release-4.17] OCPBUGS-55787: Fix containerd host.toml generation to work with mirrors using an org_name [release-4.17] OCPBUGS-55915: Fix containerd host.toml generation to work with mirrors using an org_name May 8, 2025
@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 8, 2025
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-55915, which is invalid:

  • expected dependent Jira Issue OCPBUGS-55787 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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.

In response to this:

This is an automated cherry-pick of #2879

/assign sebsoto

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 mansikulkarni96 and sebsoto May 8, 2025 02:03
@mansikulkarni96
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mansikulkarni96, openshift-cherrypick-robot

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 May 8, 2025
@jrvaldes
Copy link
Contributor

/retest-required

@jrvaldes
Copy link
Contributor

/lgtm

@mtnbikenc
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@mtnbikenc: An error was encountered updating to the POST state for bug OCPBUGS-55915 on the Jira server at https://issues.redhat.com/. No known errors were detected, please see the full error message for details.

Full error message. No response returned: Post "https://issues.redhat.com/rest/api/2/issue/16886053/transitions": POST https://issues.redhat.com/rest/api/2/issue/16886053/transitions giving up after 5 attempt(s)

Please contact an administrator to resolve this issue, then request a bug refresh with /jira refresh.

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.

@jrvaldes
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label May 22, 2025
@openshift-ci-robot
Copy link

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.z) matches configured target version for branch (4.17.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-55787 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-55787 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
  • bug has dependents

Requesting review from QA contact:
/cc @rrasouli

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-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 22, 2025
@openshift-ci openshift-ci bot requested a review from rrasouli May 22, 2025 20:16
@jrvaldes
Copy link
Contributor

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 41334b1 and 2 for PR HEAD b120940 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 41334b1 and 2 for PR HEAD b120940 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 094f066 and 1 for PR HEAD b120940 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 094f066 and 2 for PR HEAD b120940 in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 094f066 and 2 for PR HEAD b120940 in total

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 27, 2025

@openshift-cherrypick-robot: The following test 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/azure-e2e-upgrade b120940 link true /test azure-e2e-upgrade

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

@sebsoto
Copy link
Contributor

sebsoto commented May 27, 2025

/retest

1 similar comment
@sebsoto
Copy link
Contributor

sebsoto commented May 27, 2025

/retest

@sebsoto
Copy link
Contributor

sebsoto commented May 27, 2025

/override ci/prow/azure-e2e-upgrade

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 27, 2025

@sebsoto: Overrode contexts on behalf of sebsoto: ci/prow/azure-e2e-upgrade

In response to this:

/override ci/prow/azure-e2e-upgrade

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.

@sebsoto
Copy link
Contributor

sebsoto commented May 27, 2025

/override ci/prow/azure-e2e-upgrade ci/prow/vsphere-disconnected-e2e-operator

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 27, 2025

@sebsoto: Overrode contexts on behalf of sebsoto: ci/prow/azure-e2e-upgrade, ci/prow/vsphere-disconnected-e2e-operator

In response to this:

/override ci/prow/azure-e2e-upgrade ci/prow/vsphere-disconnected-e2e-operator

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.

@sebsoto
Copy link
Contributor

sebsoto commented May 27, 2025

/override ci/prow/nutanix-e2e-operator

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 27, 2025

@sebsoto: Overrode contexts on behalf of sebsoto: ci/prow/nutanix-e2e-operator

In response to this:

/override ci/prow/nutanix-e2e-operator

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-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 094f066 and 2 for PR HEAD b120940 in total

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mansikulkarni96 mansikulkarni96 Awaiting requested review from mansikulkarni96

@sebsoto sebsoto Awaiting requested review from sebsoto

@rrasouli rrasouli Awaiting requested review from rrasouli

Assignees

@sebsoto sebsoto

@mansikulkarni96 mansikulkarni96

@jrvaldes jrvaldes

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@openshift-cherrypick-robot @openshift-ci-robot @mansikulkarni96 @jrvaldes @mtnbikenc @sebsoto