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

OCPBUGS-30516: bump golang-protobuf for CVE fix #8379

Merged
merged 2 commits into from
May 26, 2024

Conversation

r4f4
Copy link
Contributor

@r4f4 r4f4 commented May 9, 2024

Bump golang.org/protobuf to v1.33.0 for GHSA-8r3f-844c-mc37 fix.

Notice that, in some cases, github.com/golang/protobuf had to be bumped to v1.5.4 because of golang/protobuf#1596.

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

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @gpei

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

In response to this:

Bump golang.org/protobuf to v1.33.0 for GHSA-8r3f-844c-mc37 fix.

Notice that, in some cases, github.com/golang/protobuf had to be bumped to v1.5.4 because of golang/protobuf#1596.

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 May 10, 2024

/retest-required

@r4f4
Copy link
Contributor Author

r4f4 commented May 11, 2024

/test images

2 similar comments
@r4f4
Copy link
Contributor Author

r4f4 commented May 14, 2024

/test images

@deepsm007
Copy link
Contributor

/test images

@deepsm007
Copy link
Contributor

/retest

@deepsm007
Copy link
Contributor

deepsm007 commented May 16, 2024

/test images
debugging the failures

@r4f4
Copy link
Contributor Author

r4f4 commented May 16, 2024

/retest-required

@openshift-merge-robot openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 18, 2024
r4f4 added 2 commits May 23, 2024 13:07
Bump golang.org/protobuf to v1.33.0 for CVE-2024-24786 fix.

Notice that, in some cases, github.com/golang/protobuf had to be bumped
to v1.5.4 because of golang/protobuf#1596.
@r4f4
Copy link
Contributor Author

r4f4 commented May 23, 2024

Update: rebased after the removal of some terraform providers.

@r4f4
Copy link
Contributor Author

r4f4 commented May 23, 2024

/override ci/prow/okd-images
Known issue

@r4f4
Copy link
Contributor Author

r4f4 commented May 23, 2024

/cherry-pick release-4.16

@openshift-cherrypick-robot

@r4f4: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.16

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.

Copy link
Contributor

openshift-ci bot commented May 23, 2024

@r4f4: Overrode contexts on behalf of r4f4: ci/prow/okd-images

In response to this:

/override ci/prow/okd-images
Known issue

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.

@pawanpinjarkar
Copy link
Contributor

/retest-required

@pawanpinjarkar
Copy link
Contributor

/lgtm

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

sadasu commented May 23, 2024

/approve

Copy link
Contributor

openshift-ci bot commented May 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sadasu

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 do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 24, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented May 24, 2024

/override ci/prow/okd-images

Copy link
Contributor

openshift-ci bot commented May 24, 2024

@r4f4: Overrode contexts on behalf of r4f4: ci/prow/okd-images

In response to this:

/override ci/prow/okd-images

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.

@r4f4
Copy link
Contributor Author

r4f4 commented May 24, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 24, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented May 24, 2024

/test e2e-azure-ovn

@r4f4
Copy link
Contributor Author

r4f4 commented May 24, 2024

/test ?

Copy link
Contributor

openshift-ci bot commented May 24, 2024

@r4f4: The following commands are available to trigger required jobs:

  • /test agent-integration-tests
  • /test altinfra-images
  • /test altinfra-periodics-images
  • /test aro-unit
  • /test e2e-agent-compact-ipv4
  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-edge-zones-manifest-validation
  • /test e2e-aws-ovn-upi
  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-upi
  • /test e2e-gcp-ovn
  • /test e2e-gcp-ovn-upi
  • /test e2e-metal-ipi-ovn-ipv6
  • /test e2e-openstack-ovn
  • /test e2e-vsphere-ovn
  • /test e2e-vsphere-upi
  • /test gofmt
  • /test golint
  • /test govet
  • /test images
  • /test okd-images
  • /test okd-unit
  • /test okd-verify-codegen
  • /test openstack-manifests
  • /test shellcheck
  • /test terraform-images
  • /test terraform-verify-vendor
  • /test tf-lint
  • /test unit
  • /test verify-codegen
  • /test verify-vendor
  • /test yaml-lint

The following commands are available to trigger optional jobs:

  • /test altinfra-e2e-aws-custom-security-groups
  • /test altinfra-e2e-aws-ovn
  • /test altinfra-e2e-aws-ovn-fips
  • /test altinfra-e2e-aws-ovn-imdsv2
  • /test altinfra-e2e-aws-ovn-localzones
  • /test altinfra-e2e-aws-ovn-proxy
  • /test altinfra-e2e-aws-ovn-public-ipv4-pool
  • /test altinfra-e2e-aws-ovn-shared-vpc
  • /test altinfra-e2e-aws-ovn-shared-vpc-local-zones
  • /test altinfra-e2e-aws-ovn-shared-vpc-wavelength-zones
  • /test altinfra-e2e-aws-ovn-single-node
  • /test altinfra-e2e-aws-ovn-wavelengthzones
  • /test altinfra-e2e-azure-capi-ovn
  • /test altinfra-e2e-gcp-capi-ovn
  • /test altinfra-e2e-gcp-ovn-byo-network-capi
  • /test altinfra-e2e-gcp-ovn-secureboot-capi
  • /test altinfra-e2e-gcp-ovn-xpn-capi
  • /test altinfra-e2e-ibmcloud-capi-ovn
  • /test altinfra-e2e-nutanix-capi-ovn
  • /test altinfra-e2e-openstack-capi-ccpmso
  • /test altinfra-e2e-openstack-capi-ccpmso-zone
  • /test altinfra-e2e-openstack-capi-dualstack
  • /test altinfra-e2e-openstack-capi-dualstack-upi
  • /test altinfra-e2e-openstack-capi-dualstack-v6primary
  • /test altinfra-e2e-openstack-capi-externallb
  • /test altinfra-e2e-openstack-capi-nfv-intel
  • /test altinfra-e2e-openstack-capi-ovn
  • /test altinfra-e2e-openstack-capi-proxy
  • /test altinfra-e2e-powervs-capi-ovn
  • /test altinfra-e2e-vsphere-capi-multi-vcenter-ovn
  • /test altinfra-e2e-vsphere-capi-ovn
  • /test altinfra-e2e-vsphere-capi-static-ovn
  • /test altinfra-e2e-vsphere-capi-zones
  • /test altinfra-openstack-capi-manifests
  • /test azure-ovn-marketplace-images
  • /test e2e-agent-compact-ipv4-appliance
  • /test e2e-agent-compact-ipv4-appliance-diskimage
  • /test e2e-agent-compact-ipv4-none-platform
  • /test e2e-agent-ha-dualstack
  • /test e2e-agent-sno-ipv4-pxe
  • /test e2e-agent-sno-ipv6
  • /test e2e-aws-custom-security-groups
  • /test e2e-aws-overlay-mtu-ovn-1200
  • /test e2e-aws-ovn-edge-zones
  • /test e2e-aws-ovn-fips
  • /test e2e-aws-ovn-imdsv2
  • /test e2e-aws-ovn-proxy
  • /test e2e-aws-ovn-public-subnets
  • /test e2e-aws-ovn-shared-vpc
  • /test e2e-aws-ovn-shared-vpc-edge-zones
  • /test e2e-aws-ovn-single-node
  • /test e2e-aws-ovn-upgrade
  • /test e2e-aws-ovn-workers-rhel8
  • /test e2e-aws-upi-proxy
  • /test e2e-azure-ovn-resourcegroup
  • /test e2e-azure-ovn-shared-vpc
  • /test e2e-azurestack
  • /test e2e-azurestack-upi
  • /test e2e-crc
  • /test e2e-gcp-ovn-byo-vpc
  • /test e2e-gcp-ovn-xpn
  • /test e2e-gcp-secureboot
  • /test e2e-gcp-upgrade
  • /test e2e-gcp-upi-xpn
  • /test e2e-ibmcloud-ovn
  • /test e2e-metal-assisted
  • /test e2e-metal-ipi-ovn
  • /test e2e-metal-ipi-ovn-dualstack
  • /test e2e-metal-ipi-ovn-swapped-hosts
  • /test e2e-metal-ipi-ovn-virtualmedia
  • /test e2e-metal-single-node-live-iso
  • /test e2e-nutanix-ovn
  • /test e2e-openstack-ccpmso
  • /test e2e-openstack-ccpmso-zone
  • /test e2e-openstack-dualstack
  • /test e2e-openstack-dualstack-upi
  • /test e2e-openstack-externallb
  • /test e2e-openstack-nfv-intel
  • /test e2e-openstack-proxy
  • /test e2e-vsphere-static-ovn
  • /test e2e-vsphere-upi-zones
  • /test e2e-vsphere-zones
  • /test e2e-vsphere-zones-techpreview
  • /test okd-e2e-agent-compact-ipv4
  • /test okd-e2e-agent-ha-dualstack
  • /test okd-e2e-agent-sno-ipv6
  • /test okd-e2e-aws-ovn
  • /test okd-e2e-aws-ovn-upgrade
  • /test okd-e2e-gcp
  • /test okd-e2e-gcp-ovn-upgrade
  • /test okd-e2e-vsphere
  • /test okd-scos-images
  • /test tf-fmt

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-installer-master-altinfra-images
  • pull-ci-openshift-installer-master-altinfra-periodics-images
  • pull-ci-openshift-installer-master-aro-unit
  • pull-ci-openshift-installer-master-azure-ovn-marketplace-images
  • pull-ci-openshift-installer-master-e2e-aws-ovn
  • pull-ci-openshift-installer-master-e2e-azure-ovn
  • pull-ci-openshift-installer-master-e2e-azure-ovn-shared-vpc
  • pull-ci-openshift-installer-master-e2e-azurestack
  • pull-ci-openshift-installer-master-e2e-gcp-ovn
  • pull-ci-openshift-installer-master-e2e-gcp-ovn-byo-vpc
  • pull-ci-openshift-installer-master-e2e-gcp-ovn-xpn
  • pull-ci-openshift-installer-master-e2e-gcp-secureboot
  • pull-ci-openshift-installer-master-gofmt
  • pull-ci-openshift-installer-master-golint
  • pull-ci-openshift-installer-master-govet
  • pull-ci-openshift-installer-master-images
  • pull-ci-openshift-installer-master-okd-e2e-aws-ovn-upgrade
  • pull-ci-openshift-installer-master-okd-images
  • pull-ci-openshift-installer-master-okd-unit
  • pull-ci-openshift-installer-master-okd-verify-codegen
  • pull-ci-openshift-installer-master-shellcheck
  • pull-ci-openshift-installer-master-terraform-images
  • pull-ci-openshift-installer-master-terraform-verify-vendor
  • pull-ci-openshift-installer-master-tf-fmt
  • pull-ci-openshift-installer-master-tf-lint
  • pull-ci-openshift-installer-master-unit
  • pull-ci-openshift-installer-master-verify-codegen
  • pull-ci-openshift-installer-master-verify-vendor
  • pull-ci-openshift-installer-master-yaml-lint

In response to this:

/test ?

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.

@r4f4
Copy link
Contributor Author

r4f4 commented May 24, 2024

/test e2e-nutanix-ovn altinfra-e2e-azure-capi-ovn altinfra-e2e-gcp-capi-ovn

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD c8febae and 2 for PR HEAD 9fa3ad6 in total

@r4f4
Copy link
Contributor Author

r4f4 commented May 25, 2024

/hold
The azure e2e failures might be a result of the protobuf bump.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 25, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented May 26, 2024

/test e2e-azure-ovn

@r4f4
Copy link
Contributor Author

r4f4 commented May 26, 2024

/hold cancel

I was seeing ~40 e2e failures in the azure-ovn job but I noticed they also happened in other azure jobs from other PRs (azurestack and azure-ovn-upi) and now I see the failures dropped to ~7. I don't think they are related to this PR.

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 26, 2024
@r4f4
Copy link
Contributor Author

r4f4 commented May 26, 2024

/override ci/prow/e2e-azure-ovn

Copy link
Contributor

openshift-ci bot commented May 26, 2024

@r4f4: Overrode contexts on behalf of r4f4: ci/prow/e2e-azure-ovn

In response to this:

/override ci/prow/e2e-azure-ovn

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
Contributor

/retest-required

Remaining retests: 0 against base HEAD c4fa054 and 1 for PR HEAD 9fa3ad6 in total

@r4f4
Copy link
Contributor Author

r4f4 commented May 26, 2024

/override ci/prow/okd-images

Copy link
Contributor

openshift-ci bot commented May 26, 2024

@r4f4: Overrode contexts on behalf of r4f4: ci/prow/okd-images

In response to this:

/override ci/prow/okd-images

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.

Copy link
Contributor

openshift-ci bot commented May 26, 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-gcp-ovn-shared-vpc 986ec20 link false /test e2e-gcp-ovn-shared-vpc
ci/prow/e2e-aws-ovn-edge-zones-manifest-validation 986ec20 link true /test e2e-aws-ovn-edge-zones-manifest-validation
ci/prow/openstack-manifests 986ec20 link true /test openstack-manifests
ci/prow/e2e-openstack-proxy 986ec20 link false /test e2e-openstack-proxy
ci/prow/e2e-aws-ovn-edge-zones 986ec20 link false /test e2e-aws-ovn-edge-zones
ci/prow/e2e-openstack-ovn 986ec20 link true /test e2e-openstack-ovn
ci/prow/e2e-aws-custom-security-groups 986ec20 link false /test e2e-aws-custom-security-groups
ci/prow/e2e-aws-ovn-single-node 986ec20 link false /test e2e-aws-ovn-single-node
ci/prow/e2e-aws-ovn-shared-vpc-edge-zones 986ec20 link false /test e2e-aws-ovn-shared-vpc-edge-zones
ci/prow/e2e-aws-ovn-shared-vpc 986ec20 link false /test e2e-aws-ovn-shared-vpc
ci/prow/e2e-aws-ovn-fips 986ec20 link false /test e2e-aws-ovn-fips
ci/prow/e2e-openstack-nfv-intel 986ec20 link false /test e2e-openstack-nfv-intel
ci/prow/e2e-aws-ovn-imdsv2 986ec20 link false /test e2e-aws-ovn-imdsv2
ci/prow/altinfra-openstack-capi-manifests 986ec20 link false /test altinfra-openstack-capi-manifests
ci/prow/e2e-gcp-secureboot 9fa3ad6 link false /test e2e-gcp-secureboot
ci/prow/e2e-azure-ovn-shared-vpc 9fa3ad6 link false /test e2e-azure-ovn-shared-vpc
ci/prow/e2e-azurestack 9fa3ad6 link false /test e2e-azurestack
ci/prow/e2e-gcp-ovn-byo-vpc 9fa3ad6 link false /test e2e-gcp-ovn-byo-vpc
ci/prow/e2e-gcp-ovn-xpn 9fa3ad6 link false /test e2e-gcp-ovn-xpn
ci/prow/okd-e2e-aws-ovn-upgrade 9fa3ad6 link false /test okd-e2e-aws-ovn-upgrade
ci/prow/e2e-nutanix-ovn 9fa3ad6 link false /test e2e-nutanix-ovn
ci/prow/altinfra-e2e-azure-capi-ovn 9fa3ad6 link false /test altinfra-e2e-azure-capi-ovn
ci/prow/altinfra-e2e-gcp-capi-ovn 9fa3ad6 link false /test altinfra-e2e-gcp-capi-ovn

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.

@r4f4
Copy link
Contributor Author

r4f4 commented May 26, 2024

/override ci/prow/e2e-aws-ovn ci/prow/e2e-gcp-ovn
Few e2e failures.

Copy link
Contributor

openshift-ci bot commented May 26, 2024

@r4f4: Overrode contexts on behalf of r4f4: ci/prow/e2e-aws-ovn, ci/prow/e2e-gcp-ovn

In response to this:

/override ci/prow/e2e-aws-ovn ci/prow/e2e-gcp-ovn
Few e2e failures.

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-merge-bot openshift-merge-bot bot merged commit 3204a5a into openshift:master May 26, 2024
24 of 33 checks passed
@openshift-ci-robot
Copy link
Contributor

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

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

In response to this:

Bump golang.org/protobuf to v1.33.0 for GHSA-8r3f-844c-mc37 fix.

Notice that, in some cases, github.com/golang/protobuf had to be bumped to v1.5.4 because of golang/protobuf#1596.

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 May 26, 2024

/cherry-pick release-4.16

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-installer-altinfra-container-v4.17.0-202405262242.p0.g3204a5a.assembly.stream.el9 for distgit ose-installer-altinfra.
All builds following this will include this PR.

@r4f4
Copy link
Contributor Author

r4f4 commented May 27, 2024

/cherry-pick release-4.16

1 similar comment
@r4f4
Copy link
Contributor Author

r4f4 commented May 27, 2024

/cherry-pick release-4.16

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

8 participants