Skip to content

[release-4.13] OCPBUGS-27649,OCPBUGS-27564,OCPBUGS-27654,OCPBUGS-27569: bump go-git/v5 to 5.11.0 #682

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
Merged
merged 2 commits into from
Feb 7, 2024
Merged

[release-4.13] OCPBUGS-27649,OCPBUGS-27564,OCPBUGS-27654,OCPBUGS-27569: bump go-git/v5 to 5.11.0 #682

merged 2 commits into from
Feb 7, 2024

Conversation

anik120
Copy link
Contributor

@anik120 anik120 commented Feb 5, 2024

Fix for CVE-2023-49568 and CVE-2023-49569 for OLM and operator-registry.

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Feb 5, 2024
@openshift-ci-robot
Copy link

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-27650 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-27650 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-27565 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-27565 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-27655 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-27655 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-27570 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-27570 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

In response to this:

Fix for CVE-2023-49568 and CVE-2023-49569 for OLM and operator-registry.

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 5, 2024
anik120
anik120 commented Feb 5, 2024
View reviewed changes
Copy link
Contributor Author

@anik120 anik120 left a comment

Choose a reason for hiding this comment

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

Things to Note:

go.mod
Comment on lines -268 to -270
// pin to ginkgo v1 version of gomega (v1.18+ relies on ginkgo v2)
github.com/onsi/gomega => github.com/onsi/gomega v1.17.0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was introduced by DanS here, that was removed in 4.14. Had to remove it from 4.13 manually to get dependencies to resolve correctly. This was not a part of @grokspawn's commit.

vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go
}
b.WriteString("}")
return b.Bytes(), nil
// Ensure for add and replace we emit `value: null`
Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are changes to the vendor folder after pulling in @ankitathomas's commit, which is new for 4.13. There were no changes to the vendor folder after pulling in the commit until 4.14.

@oceanc80
Copy link
Contributor

oceanc80 commented Feb 5, 2024

/label backport-risk-assessed

@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 Feb 5, 2024
ankitathomas
ankitathomas approved these changes Feb 5, 2024
View reviewed changes
Copy link
Contributor

@ankitathomas ankitathomas left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2024
grokspawn and others added 2 commits February 5, 2024 17:17
@grokspawn @anik120
bump go-git/v5 to 5.11.0 (#1175)
a16694f 
Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 146320b6da253cde65c18461796e19840fc04f0a
@ankitathomas @anik120
Bump go-git/v5 version to 5.11.0
2dfb259 
Signed-off-by: Ankita Thomas <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 134cceeb21059dbcbcef68e95c623dc83fede4fe
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2024
ankitathomas
ankitathomas approved these changes Feb 5, 2024
View reviewed changes
Copy link
Contributor

@ankitathomas ankitathomas left a comment

Choose a reason for hiding this comment

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

/lgtm

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

openshift-ci bot commented Feb 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120, ankitathomas

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

@kevinrizza
Copy link
Member

/retest

1 similar comment
@anik120
Copy link
Contributor Author

anik120 commented Feb 6, 2024

/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 6, 2024

@anik120: 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.

@bandrade
Copy link
Contributor

bandrade commented Feb 7, 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 Feb 7, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 4cc5232 into openshift:release-4.13 Feb 7, 2024
@openshift-ci-robot
Copy link

@anik120: Jira Issue OCPBUGS-27649: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-27564: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-27654: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-27569: All pull requests linked via external trackers have merged:

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

In response to this:

Fix for CVE-2023-49568 and CVE-2023-49569 for OLM and operator-registry.

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.13.0-202402072037.p0.g4cc5232.assembly.stream.el8 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.13.0-0.nightly-2024-02-07-232248

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

@ankitathomas ankitathomas ankitathomas approved these changes

@joelanford joelanford Awaiting requested review from joelanford

@kevinrizza kevinrizza Awaiting requested review from kevinrizza

Assignees

@bandrade bandrade

@ankitathomas ankitathomas

@jianzhangbjz jianzhangbjz

@emmajiafan emmajiafan

@kuiwang02 kuiwang02

@Xia-Zhao-rh Xia-Zhao-rh

@KeenonLee KeenonLee

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/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.