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 #772

Closed
wants to merge 365 commits into from
Closed

Conversation

soltysh
Copy link
Member

@soltysh soltysh commented May 25, 2021

Alternate approach to #765

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

Revert & re-apply to have clean picks:

  • - b28c83b - UPSTREAM: 98939: fixes race in TestSyncPodsDeletesWhenSourcesAreReadyPerQOS
  • - aa898ee - UPSTREAM: 98956: Fix race when KillPod followed by IsPodPendingTermination
  • - 6363ff8 - UPSTREAM: 98742: Sync completed pods until their containers have been terminated
  • - f7e741a - UPSTREAM: 98424: register all pending pod deletions and check for kill

git merge v1.20.7:

Explicit conflicts resolved in separate commits:

  • 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 and go.sum files which I picked from upstream, since I was running hack/update-vendor.sh and make update afterwards.

changshuchao and others added 30 commits February 5, 2021 18:12
…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 …
…ck-of-#94087-upstream-release-1.20

Automated cherry pick of kubernetes#94087: node sync at least once
…ick-of-#98103-upstream-release-1.20

Automated cherry pick of kubernetes#98103: kubelet: Delete static pods gracefully
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
…k-of-#98834-upstream-release-1.20

[1.20][go1.15] Update to go1.15.8
@openshift-ci
Copy link

openshift-ci bot commented May 25, 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 25, 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
Copy link

openshift-ci bot commented May 25, 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 vendor-update Touching vendor dir or related files label May 25, 2021
@openshift-ci openshift-ci bot requested review from deads2k and mrunalp May 25, 2021 14:50
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 25, 2021
k8s.io/gengo v0.0.0-20201113003025-83324d819ded
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
)

replace k8s.io/code-generator => ../code-generator
replace (
Copy link
Member

Choose a reason for hiding this comment

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

interesting, why would make update result in these replacements

@openshift-ci
Copy link

openshift-ci bot commented May 25, 2021

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

Test name Commit Details Rerun command
ci/prow/verify-commits e53594d link /test verify-commits
ci/prow/unit e53594d link /test unit
ci/prow/e2e-metal-ipi e53594d link /test e2e-metal-ipi
ci/prow/e2e-metal-ipi-ovn-dualstack e53594d link /test e2e-metal-ipi-ovn-dualstack
ci/prow/e2e-metal-ipi-ovn-ipv6 e53594d link /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-aws-jenkins e53594d link /test e2e-aws-jenkins
ci/prow/e2e-azure e53594d link /test e2e-azure
ci/prow/e2e-vsphere e53594d link /test e2e-vsphere
ci/prow/e2e-aws-multitenant e53594d link /test e2e-aws-multitenant
ci/prow/e2e-aws-upgrade e53594d link /test e2e-aws-upgrade

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.

@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 the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label 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.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 23, 2021
@soltysh soltysh closed this Sep 7, 2021
@soltysh soltysh deleted the rebase-1.20.7-take-two branch September 7, 2021 13:24
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. 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