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-21221: Carrying fixes for CVE-2023-44487 #222

Merged
merged 4 commits into from
Oct 27, 2023
Merged

OCPBUGS-21221: Carrying fixes for CVE-2023-44487 #222

merged 4 commits into from
Oct 27, 2023

Conversation

dusk125
Copy link

@dusk125 dusk125 commented Oct 18, 2023

No description provided.

@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 Oct 18, 2023
@openshift-ci-robot
Copy link

@dusk125: This pull request references Jira Issue OCPBUGS-21221, which is invalid:

  • expected Jira Issue OCPBUGS-21221 to depend on a bug targeting a version in 4.15.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, 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.

In response to this:

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.

@dusk125
Copy link
Author

dusk125 commented Oct 18, 2023

Needs one more fix: etcd-io#16790
/hold

This was referenced Oct 18, 2023
Closed
Closed
@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 Oct 18, 2023
@openshift-ci openshift-ci bot requested review from deads2k and Elbehery October 18, 2023 16:07
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2023
serathius and others added 3 commits October 18, 2023 12:13
@serathius @dusk125
Merge pull request etcd-io#16743 from dusk125/3.5-http2
0e7f053 
[3.5] Bump golang.org/x/net to v0.17.0
@wenjiaswe @dusk125
Merge pull request etcd-io#16625 from chaochn47/release-3.5-backport-…
fb86de9 
…gRPC-go-updates

[3.5] Bump grpc-go to1.47 (and fix the connection-string format)
@serathius @dusk125
Merge pull request etcd-io#16781 from chaochn47/release-3.5-backport-…
5f7848e 
…gRPC-update

[release-3.5]: upgrade gRPC-go to v1.52.0
@tjungblu
Copy link

/payload 4.14 nightly blocking

@openshift-ci
Copy link

openshift-ci bot commented Oct 18, 2023

@tjungblu: trigger 8 job(s) of type blocking for the nightly release of OCP 4.14

  • periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.14-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.14-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.14-e2e-aws-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.14-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.14-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/efa24420-6dd3-11ee-9fd4-17558dde4c85-0

@tjungblu
Copy link

/retest-required

@tjungblu
Copy link

/label baclport-risk-assessed

@openshift-ci
Copy link

openshift-ci bot commented Oct 19, 2023

@tjungblu: The label(s) /label baclport-risk-assessed cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, downstream-change-needed, rebase/manual, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/valid-bug, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label baclport-risk-assessed

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.

@tjungblu
Copy link

/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 Oct 19, 2023
@tjungblu
Copy link

/cherry-pick release-4.13
/cherry-pick release-4.12
/cherry-pick release-4.11
/cherry-pick release-4.10

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.13
/cherry-pick release-4.12
/cherry-pick release-4.11
/cherry-pick release-4.10

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.

@tjungblu
Copy link

/jira refresh

@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-21221, which is invalid:

  • expected Jira Issue OCPBUGS-21221 to depend on a bug targeting a version in 4.15.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, 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.

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 kubernetes/test-infra repository.

@tjungblu
Copy link

/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 Oct 19, 2023
@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-21221, 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.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-22042 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-22042 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @geliu2016

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 kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested a review from geliu2016 October 19, 2023 09:36
@dusk125
Copy link
Author

dusk125 commented Oct 19, 2023

/unhold
Last PR has been merged and included

@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 Oct 19, 2023
@tjungblu
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2023
@dusk125
Copy link
Author

dusk125 commented Oct 19, 2023

/retest

@dusk125
Copy link
Author

dusk125 commented Oct 19, 2023

@geliu2016 ptal

@openshift-ci
Copy link

openshift-ci bot commented Oct 19, 2023

@dusk125: The following test 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-etcd-recovery 3f4128d link false /test e2e-aws-etcd-recovery

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.

geliu2016
geliu2016 approved these changes Oct 20, 2023
View reviewed changes
Copy link

@geliu2016 geliu2016 left a comment

Choose a reason for hiding this comment

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

/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 Oct 20, 2023
@openshift-ci
Copy link

openshift-ci bot commented Oct 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, geliu2016, tjungblu

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

@sdodson
Copy link
Member

sdodson commented Oct 27, 2023

/label staff-eng-approved

@openshift-ci openshift-ci bot added the staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead). label Oct 27, 2023
@openshift-ci openshift-ci bot merged commit 497a17f into openshift:openshift-4.14 Oct 27, 2023
@openshift-ci-robot
Copy link

@dusk125: Jira Issue OCPBUGS-21221: All pull requests linked via external trackers have merged:

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

In response to this:

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.

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.13
/cherry-pick release-4.12
/cherry-pick release-4.11
/cherry-pick release-4.10

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.

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.13
/cherry-pick release-4.12
/cherry-pick release-4.11
/cherry-pick release-4.10

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.

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.13
/cherry-pick release-4.12
/cherry-pick release-4.11
/cherry-pick release-4.10

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.

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-4.13
/cherry-pick release-4.12
/cherry-pick release-4.11
/cherry-pick release-4.10

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.

@dusk125
Copy link
Author

dusk125 commented Oct 27, 2023

/cherry-pick openshift-4.13
/cherry-pick openshift-4.12
/cherry-pick openshift-4.11
/cherry-pick openshift-4.10

@dusk125 dusk125 deleted the 3.5-cve-carries branch October 27, 2023 17:57
@openshift-cherrypick-robot
Copy link

@dusk125: #222 failed to apply on top of branch "openshift-4.13":

Applying: Merge pull request #16743 from dusk125/3.5-http2
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
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 Merge pull request #16743 from dusk125/3.5-http2
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 openshift-4.13
/cherry-pick openshift-4.12
/cherry-pick openshift-4.11
/cherry-pick openshift-4.10

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.

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

@geliu2016 geliu2016 geliu2016 approved these changes

@deads2k deads2k Awaiting requested review from deads2k

@Elbehery Elbehery Awaiting requested review from Elbehery

Assignees

@tjungblu tjungblu

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. staff-eng-approved Indicates a release branch PR has been approved by a staff engineer (formerly group/pillar lead).
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@dusk125 @openshift-ci-robot @tjungblu @openshift-cherrypick-robot @sdodson @geliu2016 @serathius @wenjiaswe @ahrtr