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

OCPBUGS-35586: [release-4.15] bump github.com/containers/image for CVE fix #8621

Merged
merged 3 commits into from
Jun 19, 2024
Merged

OCPBUGS-35586: [release-4.15] bump github.com/containers/image for CVE fix #8621

merged 3 commits into from
Jun 19, 2024

Conversation

r4f4
Copy link
Contributor

@r4f4 r4f4 commented Jun 17, 2024

Manual cherry-pick of #8611

@r4f4
Copy link
Contributor Author

r4f4 commented Jun 17, 2024

/jira cherrypick OCPBUGS-35527

@openshift-ci-robot
Copy link
Contributor

@r4f4: Jira Issue OCPBUGS-35527 has been cloned as Jira Issue OCPBUGS-35586. Will retitle bug to link to clone.
/retitle OCPBUGS-35586: [release-4.15] bump github.com/containers/image for CVE fix

In response to this:

/jira cherrypick OCPBUGS-35527

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.15] bump github.com/containers/image for CVE fix OCPBUGS-35586: [release-4.15] bump github.com/containers/image for CVE fix Jun 17, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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 Jun 17, 2024
@openshift-ci-robot
Copy link
Contributor

@r4f4: This pull request references Jira Issue OCPBUGS-35586, which is invalid:

  • expected dependent Jira Issue OCPBUGS-35527 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA 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:

Manual cherry-pick of #8611

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.

@patrickdillon
Copy link
Contributor

/approve
/lgtm

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

openshift-ci bot commented Jun 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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 Jun 17, 2024
@patrickdillon
Copy link
Contributor

agent build errors look like an issue with repos. we can retest after this run

@patrickdillon
Copy link
Contributor

/label backport-risk-assessed
/retest-required
/skip

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 18, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 18, 2024

@r4f4: 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-aws-ovn-upgrade b216ed6 link false /test e2e-aws-ovn-upgrade
ci/prow/okd-scos-e2e-vsphere b216ed6 link false /test okd-scos-e2e-vsphere
ci/prow/e2e-agent-compact-ipv4-appliance b216ed6 link false /test e2e-agent-compact-ipv4-appliance
ci/prow/e2e-agent-compact-ipv4-none-platform b216ed6 link false /test e2e-agent-compact-ipv4-none-platform
ci/prow/okd-e2e-aws-ovn-upgrade b216ed6 link false /test okd-e2e-aws-ovn-upgrade
ci/prow/e2e-agent-ha-dualstack b216ed6 link false /test e2e-agent-ha-dualstack
ci/prow/okd-scos-e2e-gcp b216ed6 link false /test okd-scos-e2e-gcp
ci/prow/okd-scos-e2e-aws-ovn b216ed6 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-agent-sno-ipv6 b216ed6 link false /test e2e-agent-sno-ipv6
ci/prow/e2e-agent-sno-ipv4-pxe b216ed6 link false /test e2e-agent-sno-ipv4-pxe
ci/prow/okd-scos-e2e-gcp-ovn-upgrade b216ed6 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/okd-scos-e2e-aws-upgrade b216ed6 link false /test okd-scos-e2e-aws-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.

@gpei
Copy link
Contributor

gpei commented Jun 19, 2024

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 19, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented Jun 19, 2024

/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 Jun 19, 2024
@openshift-ci-robot
Copy link
Contributor

@r4f4: This pull request references Jira Issue OCPBUGS-35586, 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.15.z) matches configured target version for branch (4.15.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-35527 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-35527 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @gpei

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 gpei June 19, 2024 08:28
@openshift-merge-bot openshift-merge-bot bot merged commit fecb878 into openshift:release-4.15 Jun 19, 2024
39 checks passed
@openshift-ci-robot
Copy link
Contributor

@r4f4: Jira Issue OCPBUGS-35586: All pull requests linked via external trackers have merged:

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

In response to this:

Manual cherry-pick of #8611

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.

@r4f4
Copy link
Contributor Author

r4f4 commented Jun 19, 2024

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

@r4f4: #8621 failed to apply on top of branch "release-4.14":

Applying: OCPBUGS-34037: bump github.com/container/images for CVE fix
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/asset/ignition/bootstrap/common.go
M	pkg/types/validation/installconfig.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/types/validation/installconfig.go
Auto-merging pkg/asset/ignition/bootstrap/common.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-34037: bump github.com/container/images for CVE fix
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

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-installer-altinfra-container-v4.15.0-202406191006.p0.gfecb878.assembly.stream.el8 for distgit ose-installer-altinfra.
All builds following this will include this PR.

@r4f4 r4f4 mentioned this pull request Jun 19, 2024
Merged
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2024-06-20-070602

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

@andfasano andfasano Awaiting requested review from andfasano

@barbacbd barbacbd Awaiting requested review from barbacbd

@gpei gpei Awaiting requested review from gpei

Assignees

@patrickdillon patrickdillon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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.

None yet
7 participants
@r4f4 @openshift-ci-robot @patrickdillon @gpei @openshift-cherrypick-robot @openshift-bot @openshift-merge-robot