Skip to content

UPSTREAM: <drop>: bump openshift, k8s to 1.22.1#1029

Closed
wking wants to merge 1 commit intoopenshift:release-4.9from
wking:kube-bump
Closed

UPSTREAM: <drop>: bump openshift, k8s to 1.22.1#1029
wking wants to merge 1 commit intoopenshift:release-4.9from
wking:kube-bump

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Oct 29, 2021

Asking to merge #950 back into 4.9, effectively making it as if the master/4.9 fork had happened a bit later than it actually did.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Oct 29, 2021

@wking: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

UPSTREAM: : bump openshift, k8s to 1.22.1

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 the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Oct 29, 2021
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2021
@openshift-ci-robot
Copy link
Copy Markdown

@wking: the contents of this pull request could not be automatically validated.

The following commits are valid:

The following commits could not be validated and must be approved by a top-level approver:

@openshift-ci openshift-ci Bot requested review from marun and mrunalp October 29, 2021 22:45
@openshift-ci openshift-ci Bot added the vendor-update Touching vendor dir or related files label Oct 29, 2021
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Oct 29, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: wking
To complete the pull request process, please assign soltysh after the PR has been reviewed.
You can assign the PR to them by writing /assign @soltysh in a comment when ready.

The full list of commands accepted by this bot can be found here.

Details 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 removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2021
@openshift-ci-robot
Copy link
Copy Markdown

@wking: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

@wking
Copy link
Copy Markdown
Member Author

wking commented Oct 29, 2021

#950's ebd3f49 had merge conflicts in pkg/kubelet/kubelet_pods.go. ebd3f49 -> 0a3a771 takes us from "use the #950 commit directly" to "cherry pick that commit (and not the other stuff that landed right before #950) on top of release-4.9".

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Oct 30, 2021

@wking: 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/k8s-e2e-gcp 0a3a771 link true /test k8s-e2e-gcp
ci/prow/e2e-openstack-csi-manila 0a3a771 link false /test e2e-openstack-csi-manila
ci/prow/e2e-openstack-csi-cinder 0a3a771 link false /test e2e-openstack-csi-cinder
ci/prow/e2e-agnostic-cmd 0a3a771 link false /test e2e-agnostic-cmd
ci/prow/k8s-e2e-aws-serial 0a3a771 link true /test k8s-e2e-aws-serial

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/test-infra repository. I understand the commands that are listed here.

@sttts
Copy link
Copy Markdown

sttts commented Oct 30, 2021

/hold

We cannot do this. It switches over dependencies to 4.10 versions.

@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 30, 2021
@wking
Copy link
Copy Markdown
Member Author

wking commented Oct 31, 2021

/close

@openshift-ci openshift-ci Bot closed this Oct 31, 2021
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Oct 31, 2021

@wking: Closed this PR.

Details

In response to this:

/close

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

Labels

backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. vendor-update Touching vendor dir or related files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants