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

Rebase 1.20.7 #765

Closed
wants to merge 354 commits into from
Closed

Rebase 1.20.7 #765

wants to merge 354 commits into from

Conversation

soltysh
Copy link
Member

@soltysh soltysh commented May 24, 2021

Notes from the bump, I followed https://github.com/openshift/kubernetes/blob/master/REBASE.openshift.md#updating-with-git-merge-experimental

Revert step:

  • - 4c45765 - UPSTREAM: 101345: kubelet: improve the node informer sync check
  • - a6a4a10 - UPSTREAM: 98137: kubelet: avoid logspam 'kubelet nodes sync'
  • - 5f545b1 - UPSTREAM: 97323: fix the deadlock in priority and fairness config controller
  • - 2b276da - UPSTREAM: 97820: handle webhook authenticator and authorizer error
  • - d188091 - UPSTREAM: 97206: clean up executing request on panic

git merge v1.20.7:

The remaining conflicts were go.mod and go.sum files which I picked from upstream, since I was running hack/update-vendor.sh and make update afterwards.

k8s-ci-robot and others added 30 commits February 3, 2021 13:36
…-pick-of-#97003-upstream-release-1.20

Automated cherry pick of kubernetes#97003: make hostPort match test linuxonly
…-ports-1.20

[release-1.20] Use non privileged ports in scheduling conformance test
…k-of-#96821-upstream-release-1.20

Automated cherry pick of kubernetes#96821: Use volumeHandle as PV name when translating EBS inline
Cherry pick kubernetes#465 in cloud provider azure to 1.20: Cleanup subnet in frontend IP configs
…ck-of-#96617-upstream-release-1.20

Automated cherry pick of kubernetes#94599: Fixes Attach Detach Controller reconciler race reading kubernetes#96617: Recover CSI volumes from dangling attachments
…pick-of-#97877-upstream-release-1.20

Automated cherry pick of kubernetes#97877: fix azure file migration issue
…-of-#98350-upstream-release-1.20

Automated cherry pick of kubernetes#98350: aggregate errors when putting vmss
…-pick-of-#98311-upstream-release-1.20

Automated cherry pick of kubernetes#98311: Fix translation of Cinder storage classess to CSI
Update region_pd e2e test to support PV have GA topology
…iption of the --config parameter is inaccurate

Signed-off-by: changshuchao <chang.shuchao1@zte.com.cn>
…ining pods

The test is not cleaning all pods it created.
Memory balancing pods are deleted once the test namespace is.
Thus, leaving the pods running or in terminating state when a new test is run.
In case the next test is "[sig-scheduling] SchedulerPredicates [Serial] validates resource limits of pods that are allowed to run",
the test can fail.
This adds a call to createBalancedPods during the ubernetes_lite scheduling e2es,
which are prone to improper score balancing due to unbalanced utilization.
…k-of-#98715-upstream-release-1.20

Automated cherry pick of kubernetes#98715: fix kube-scheduler cannot send event because the Note field
the hostport manager was not taking into consideration the hostIP
when binding the socket of the hostPort, causing that the same
HostPort can not be used with different IP addresses.
Updates kubeadm version resolution to use kubernetes community infra
bucket to fetch appropriate k8s ci versions. The images are already
being pulled from the kubernetes community infra bucket meaning that a
mismatch can occur when the ci version is fetched from the google infra
bucket and the image is not yet present on k8s infra.

Follow-up to kubernetes#97087

Signed-off-by: hasheddan <georgedanielmangum@gmail.com>
The k8s release bucket constant is not longer overriden in network tests
because the fetcher is mocked rather than using httptest.NewServer. See
previous implementation in
https://github.com/kubernetes/kubernetes/pull/49119/files#diff-82f2b09991047d4a1884d53dedadd64a473d5c4dc75293514e71773ceedf08e2R128

Signed-off-by: hasheddan <georgedanielmangum@gmail.com>
…ick-of-#98836-upstream-release-1.20

Automated cherry pick of kubernetes#98836: kubeadm: get k8s CI version markers from k8s infra bucket
…-pick-of-#98750-upstream-release-1.20

Automated cherry pick of kubernetes#98750: Fix nil pointer dereference in disruption controller
…of-#98755-upstream-release-1.20

Automated cherry pick of kubernetes#98755 upstream release 1.20
Clear conntrack entries for UDP NodePorts,
this has to be done AFTER the iptables rules are programmed.
It can happen that traffic to the NodePort hits the host before
the iptables rules are programmed this will create an stale entry
in conntrack that will blackhole the traffic, so we need to
clear it ONLY when the service has endpoints.
…-of-#95111-upstream-release-1.20

[release-1.20] Automated cherry pick of kubernetes#95111: make podTopologyHints protected by lock
…scheduler

Cherry pick of kubernetes#98254:Fix the kube-scheduler binary's description of …
@openshift-ci
Copy link

openshift-ci bot commented May 24, 2021

@soltysh: 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.

In response to this:

Rebase 1.20.7

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 May 24, 2021
@openshift-ci-robot
Copy link

@soltysh: 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 added the vendor-update Touching vendor dir or related files label May 24, 2021
@openshift-ci openshift-ci bot requested review from rphillips and sttts May 24, 2021 15:25
@openshift-ci
Copy link

openshift-ci bot commented May 24, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: soltysh

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 24, 2021
@openshift-ci
Copy link

openshift-ci bot commented May 24, 2021

@soltysh: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/verify-commits 1b1fa97 link /test verify-commits
ci/prow/unit 1b1fa97 link /test unit
ci/prow/e2e-metal-ipi-ovn-ipv6 1b1fa97 link /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-aws 1b1fa97 link /test e2e-aws
ci/prow/e2e-metal-ipi 1b1fa97 link /test e2e-metal-ipi
ci/prow/e2e-gcp 1b1fa97 link /test e2e-gcp
ci/prow/e2e-aws-csi 1b1fa97 link /test e2e-aws-csi
ci/prow/e2e-metal-ipi-ovn-dualstack 1b1fa97 link /test e2e-metal-ipi-ovn-dualstack
ci/prow/e2e-agnostic-cmd 1b1fa97 link /test e2e-agnostic-cmd
ci/prow/e2e-azure-upgrade 1b1fa97 link /test e2e-azure-upgrade
ci/prow/e2e-aws-ovn 1b1fa97 link /test e2e-aws-ovn
ci/prow/e2e-aws-disruptive 1b1fa97 link /test e2e-aws-disruptive

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.

@sttts
Copy link

sttts commented May 25, 2021

/hold

I am not convinced we should allow git-merge rebases with conflicts. It lead to verson control hell.

@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, 2021
@soltysh soltysh mentioned this pull request May 25, 2021
9 tasks
@openshift-bot
Copy link

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 23, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 23, 2021

@soltysh: PR needs rebase.

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.

@soltysh soltysh closed this Sep 7, 2021
@soltysh soltysh deleted the rebase-1.20.7 branch September 7, 2021 13:23
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. 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. lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet