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.

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

[release-4.14] OCPBUGS-33356: UPSTREAM: <carry>: bump go-jose #743

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #740

/assign kevinrizza

go-jose has a patched vulnerability -- https://nvd.nist.gov/vuln/detail/CVE-2024-28180
operator-registry has an indirect dependency on that package as part of
its grpc health probe. however, the current version of the grpc dependency relies
on a deprecated version of the package. this carry commit updates
github.com/grpc-ecosystem/grpc-health-probe to 0.4.24 so that we can update
the indirect dependency to use the non deprecated repository for go-jose, then
updates go-jose to v3.0.3 where the vulnerability is patched.

Resolves https://issues.redhat.com/browse/OCPBUGS-32860

Signed-off-by: kevinrizza <krizza@redhat.com>
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-32860 has been cloned as Jira Issue OCPBUGS-33356. Will retitle bug to link to clone.
/retitle [release-4.14] OCPBUGS-33356: UPSTREAM: : bump go-jose

In response to this:

This is an automated cherry-pick of #740

/assign kevinrizza

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.14] OCPBUGS-32860: UPSTREAM: <carry>: bump go-jose [release-4.14] OCPBUGS-33356: UPSTREAM: <carry>: bump go-jose May 7, 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 7, 2024
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-33356, 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"
  • expected dependent Jira Issue OCPBUGS-32860 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:

This is an automated cherry-pick of #740

/assign kevinrizza

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.

@kevinrizza
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-33356, which is invalid:

  • expected dependent Jira Issue OCPBUGS-32860 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.

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.

@kevinrizza
Copy link
Member

/approve
/lgtm

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

openshift-ci bot commented May 7, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevinrizza, 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 7, 2024
@kevinrizza
Copy link
Member

/retest

Copy link
Contributor

openshift-ci bot commented May 7, 2024

@openshift-cherrypick-robot: 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.

@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 16, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-33356, 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.14.z) matches configured target version for branch (4.14.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-32860 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-32860 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (jfan@redhat.com), skipping review request.

In response to this:

/jira refresh
/label cherry-pick-approved

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 16, 2024
@openshift openshift deleted a comment from openshift-ci bot May 16, 2024
@kevinrizza
Copy link
Member

/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 May 16, 2024
@emmajiafan
Copy link

/label cherry-pick-approved
/lgtm

@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 May 21, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 5e8dd92 into openshift:release-4.14 May 21, 2024
13 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-33356: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #740

/assign kevinrizza

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.14.0-202405210107.p0.g5e8dd92.assembly.stream.el8 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-registry-container-v4.14.0-202405210107.p0.g5e8dd92.assembly.stream.el8 for distgit operator-registry.
All builds following this will include this PR.

@kevinrizza
Copy link
Member

/cherry-pick release-4.13,release-4.12

@openshift-cherrypick-robot
Copy link
Author

@kevinrizza: cannot checkout release-4.13,release-4.12: error checking out "release-4.13,release-4.12": exit status 1 error: pathspec 'release-4.13,release-4.12' did not match any file(s) known to git

In response to this:

/cherry-pick release-4.13,release-4.12

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.

@kevinrizza
Copy link
Member

/cherrypick release-4.13 release-4.12

@openshift-cherrypick-robot
Copy link
Author

@kevinrizza: #743 failed to apply on top of branch "release-4.13":

Applying: UPSTREAM: <carry>: bump go-jose
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/operator-registry/go.mod
M	staging/operator-registry/go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/gopkg.in/square/go-jose.v2/BUG-BOUNTY.md
Removing vendor/gopkg.in/square/go-jose.v2/.travis.yml
Removing vendor/gopkg.in/square/go-jose.v2/.gitignore
Removing vendor/gopkg.in/square/go-jose.v2/.gitcookies.sh.enc
Removing vendor/golang.org/x/tools/internal/typesinternal/objectpath.go
Removing vendor/golang.org/x/tools/internal/typeparams/typeparams_go118.go
Removing vendor/golang.org/x/tools/internal/typeparams/typeparams_go117.go
Removing vendor/golang.org/x/tools/internal/typeparams/enabled_go118.go
Removing vendor/golang.org/x/tools/internal/typeparams/enabled_go117.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk_unix.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk_portable.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk_dirent_namlen_linux.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk_dirent_namlen_bsd.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk_dirent_ino.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk_dirent_fileno.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk_darwin.go
Removing vendor/golang.org/x/tools/internal/fastwalk/fastwalk.go
Removing vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go
Removing vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go
Removing vendor/golang.org/x/crypto/ed25519/ed25519.go
Auto-merging staging/operator-registry/go.sum
CONFLICT (content): Merge conflict in staging/operator-registry/go.sum
Auto-merging staging/operator-registry/go.mod
CONFLICT (content): Merge conflict in staging/operator-registry/go.mod
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 UPSTREAM: <carry>: bump go-jose
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:

/cherrypick release-4.13 release-4.12

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.

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

Successfully merging this pull request may close these issues.

None yet

10 participants