-
Notifications
You must be signed in to change notification settings - Fork 111
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
Rebase 1.20.7 #765
Conversation
…-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 …
[1.20][go1.15] Update to go1.15.12
… informer sync check" This reverts commit 4c45765.
…belet nodes sync'" This reverts commit a6a4a10.
…ty and fairness config controller" This reverts commit 5f545b1.
…or and authorizer error" This reverts commit 2b276da.
… on panic" This reverts commit d188091.
Kubernetes official release v1.20.7
…l - re-apply missing bits
@soltysh: No Bugzilla bug is referenced in the title of this pull request. 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. |
[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 |
@soltysh: The following tests failed, say
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. |
/hold I am not convinced we should allow git-merge rebases with conflicts. It lead to verson control hell. |
Issues go stale after 90d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle stale |
@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. |
Notes from the bump, I followed https://github.com/openshift/kubernetes/blob/master/REBASE.openshift.md#updating-with-git-merge-experimental
Revert step:
git merge v1.20.7
:UU pkg/kubelet/kubelet.go
UU staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
UU staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal_test.go
The remaining conflicts were
go.mod
andgo.sum
files which I picked from upstream, since I was runninghack/update-vendor.sh
andmake update
afterwards.