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

Bug 1950025: Bump the k8s.io dependencies to v1.20.6 #56

Merged

Conversation

timflannagan
Copy link
Contributor

The following commands were run while porting the upstream PRs downstream:

git cherry-pick -Xsubtree=staging/operator-registry 866fd1bdb808b776e40f44965852441dde3cc9f6

git cherry-pick -Xsubtree=staging/operator-lifecycle-manager b077c3e88ac5ea88b6bf3a23ac459ef8f53ec73b

make vendor

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Apr 15, 2021
@openshift-ci-robot
Copy link

@timflannagan: This pull request references Bugzilla bug 1950025, which is invalid:

  • expected the bug to target the "4.8.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1950025: Bump the k8s.io dependencies to v1.20.6

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-robot openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 15, 2021
@timflannagan
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link

@timflannagan: This pull request references Bugzilla bug 1950025, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/bugzilla 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-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 15, 2021
@timflannagan
Copy link
Contributor Author

/retest

@timflannagan timflannagan force-pushed the bump-k8s-to-v1.20.6 branch 2 times, most recently from 69b84b3 to 5b71df1 Compare April 16, 2021 21:12
Makefile Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 21, 2021
@timflannagan timflannagan force-pushed the bump-k8s-to-v1.20.6 branch 6 times, most recently from 610cd7f to 0eceaa1 Compare April 22, 2021 21:29
@timflannagan
Copy link
Contributor Author

/retest

1 similar comment
@timflannagan
Copy link
Contributor Author

/retest

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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2021
@timflannagan
Copy link
Contributor Author

/retest

1 similar comment
@timflannagan
Copy link
Contributor Author

/retest

@timflannagan
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link

@timflannagan: This pull request references Bugzilla bug 1950025, which is valid.

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

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

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

The v1.20.6 contains the github.com/gogo/protobuf version bump:

https://github.com/kubernetes/kubernetes/blob/v1.20.6/go.mod#L53.

Fixes CVE-2021-3121.

Signed-off-by: timflannagan <timflannagan@gmail.com>
The v1.20.6 contains the github.com/gogo/protobuf version bump:

https://github.com/kubernetes/kubernetes/blob/v1.20.6/go.mod#L53.

Fixes CVE-2021-3121.

Signed-off-by: timflannagan <timflannagan@gmail.com>
… tree

Update the Go version from 1.15 in 1.16 in the root go.mod file.

Run `make vendor` at the root path in the repository.
@timflannagan
Copy link
Contributor Author

Hmm, it looks like that needs-rebase label is stale/stuck. May need to try closing then re-opening again.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2021
@timflannagan timflannagan reopened this Apr 23, 2021
@openshift-ci-robot
Copy link

@timflannagan: An error was encountered updating to the NEW state for bug 1950025 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message. code 32000: Red Hat Bugzilla's database reported a query serialization error. Most likely this occurred because another user or process attempted to change the same data that you were attempting to change. Please press Back and retry the transaction.
 UPDATE bugs SET bug_status = ? WHERE bug_id = ? at /var/www/html/bugzilla/Bugzilla/Object.pm line 544. 

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1950025: Bump the k8s.io dependencies to v1.20.6

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-robot
Copy link

@timflannagan: An error was encountered querying GitHub for users with public email (jiazha@redhat.com) for bug 1950025 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message. Post "http://ghproxy/graphql": dial tcp 172.30.229.2:80: i/o timeout

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1950025: Bump the k8s.io dependencies to v1.20.6

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.

@timflannagan
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link

@timflannagan: This pull request references Bugzilla bug 1950025, which is valid.

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

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

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

@timflannagan
Copy link
Contributor Author

/retest

@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 26, 2021
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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 26, 2021
Copy link
Member

@dinhxuanvu dinhxuanvu 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-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, dinhxuanvu, timflannagan

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:
  • OWNERS [ankitathomas,dinhxuanvu,timflannagan]

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

@timflannagan
Copy link
Contributor Author

/test ci/prow/e2e-aws-console-olm

@openshift-ci-robot
Copy link

@timflannagan: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test e2e-aws-console-olm
  • /test e2e-aws-olm
  • /test e2e-gcp
  • /test e2e-upgrade
  • /test images
  • /test unit-api
  • /test unit-olm
  • /test unit-registry
  • /test verify

Use /test all to run all jobs.

In response to this:

/test ci/prow/e2e-aws-console-olm

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.

@timflannagan
Copy link
Contributor Author

/test e2e-aws-console-olm

@openshift-merge-robot openshift-merge-robot merged commit 531b8b6 into openshift:master Apr 26, 2021
@openshift-ci-robot
Copy link

@timflannagan: All pull requests linked via external trackers have merged:

Bugzilla bug 1950025 has been moved to the MODIFIED state.

In response to this:

Bug 1950025: Bump the k8s.io dependencies to v1.20.6

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.

@timflannagan timflannagan deleted the bump-k8s-to-v1.20.6 branch April 26, 2021 21:36
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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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

5 participants