Skip to content

OCPBUGS-67673: bump logrus to v1.9.3 #5501

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
cheesesashimi wants to merge 1 commit into
base: release-4.13
Choose a base branch
from
Open

OCPBUGS-67673: bump logrus to v1.9.3 #5501

cheesesashimi wants to merge 1 commit into from
+42 −6

Conversation

@cheesesashimi
Copy link
Member

@cheesesashimi cheesesashimi commented Dec 15, 2025 •
edited
Loading

- What I did

Updated our dependency upon https://github.com/sirupsen/logrus.

- How to verify it

There should be no behavior changes within the MCO. Other than that, proving that this is fixed should be fairly straightforward:

  1. Clone this PR.
  2. Run podman run -it --rm -v "$PWD:/go/src/github.com/openshift/machine-config-operator:z" -w /go/src/github.com/openshift/machine-config-operator registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.13 make binaries. This will build the MCO binaries using the Go toolchain for this OCP release.
  3. Run for gobin in _output/linux/amd64/*; do echo "$gobin:"; go version -m "$gobin" | grep -i 'logrus'; done in order to view which binaries the MCO was built with. The output should resemble the following:
$ for gobin in _output/linux/amd64/*; do echo "$gobin:"; go version -m "$gobin" | grep -i 'logrus'; done
_output/linux/amd64/apiserver-watcher:
_output/linux/amd64/machine-config-controller:
        dep     github.com/sirupsen/logrus      v1.9.3
_output/linux/amd64/machine-config-daemon:
        dep     github.com/sirupsen/logrus      v1.9.3
_output/linux/amd64/machine-config-operator:
_output/linux/amd64/machine-config-server:

(Note: It is OK for components such as the apiserver-watcher, machine-config-operator, machine-config-server to not return anything. This just means that logrus is not within their dependency chain.)

- Description for the changelog
Update logrus to v1.9.3.

@cheesesashimi
bump logrus to v1.9.3
09b1627 
This mitigates CVE-2025-65637 within logrus.
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate 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 Dec 15, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 15, 2025

@cheesesashimi: This pull request references Jira Issue OCPBUGS-67673, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-67673 to depend on a bug targeting a version in 4.14.0, 4.14.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

- What I did

Updated our dependency upon https://github.com/sirupsen/logrus to address CVE-2025-65637.

- How to verify it

There should be no behavior changes within the MCO. Other than that, proving that this is fixed should be fairly straightforward:

  1. Clone this PR.
  2. Run podman run -it --rm -v "$PWD:/go/src/github.com/openshift/machine-config-operator:z" -w /go/src/github.com/openshift/machine-config-operator registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.19-openshift-4.13 make binaries. This will build the MCO binaries using the Go toolchain for this OCP release.
  3. Run for gobin in _output/linux/amd64/*; do echo "$gobin:"; go version -m "$gobin" | grep -i 'logrus'; done in order to view which binaries the MCO was built with. The output should resemble the following:
$ for gobin in _output/linux/amd64/*; do echo "$gobin:"; go version -m "$gobin" | grep -i 'logrus'; done
_output/linux/amd64/apiserver-watcher:
_output/linux/amd64/machine-config-controller:
       dep     github.com/sirupsen/logrus      v1.9.3
_output/linux/amd64/machine-config-daemon:
       dep     github.com/sirupsen/logrus      v1.9.3
_output/linux/amd64/machine-config-operator:
_output/linux/amd64/machine-config-server:

(Note: It is OK for components such as the apiserver-watcher, machine-config-operator, machine-config-server to not return anything. This just means that logrus is not within their dependency chain.)

- Description for the changelog
Update logrus to v1.9.3 to address CVE-2025-65637

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 jkyros and yuqi-zhang December 15, 2025 21:54
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 15, 2025
@cheesesashimi
Copy link
Member Author

cheesesashimi commented Dec 15, 2025

/jira refresh

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 15, 2025

@cheesesashimi: This pull request references Jira Issue OCPBUGS-67673, which is invalid:

  • expected Jira Issue OCPBUGS-67673 to depend on a bug targeting a version in 4.14.0, 4.14.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

yuqi-zhang
yuqi-zhang approved these changes Dec 15, 2025
View reviewed changes
Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

/lgtm

It's a bit annoying to track the backport all the way through, since it'll expect dependant bugs from previous versions. Perhaps we can ask for an override from someone

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

openshift-ci bot commented Dec 15, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheesesashimi, yuqi-zhang

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:
  • OWNERS [cheesesashimi,yuqi-zhang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 16, 2025

@cheesesashimi: 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/okd-scos-e2e-gcp-op 09b1627 link false /test okd-scos-e2e-gcp-op
ci/prow/e2e-gcp-op 09b1627 link true /test e2e-gcp-op
ci/prow/okd-scos-e2e-aws-ovn 09b1627 link false /test okd-scos-e2e-aws-ovn
ci/prow/okd-scos-e2e-gcp-ovn-upgrade 09b1627 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/e2e-aws-ovn-upgrade 09b1627 link true /test e2e-aws-ovn-upgrade

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.

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

Reviewers

@yuqi-zhang yuqi-zhang yuqi-zhang approved these changes

@jkyros jkyros Awaiting requested review from jkyros

Assignees

@yuqi-zhang yuqi-zhang

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate 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.

3 participants

@cheesesashimi @openshift-ci-robot @yuqi-zhang