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

v1.5 backports 2020-03-04 #10445

Merged
merged 4 commits into from Mar 4, 2020
Merged

v1.5 backports 2020-03-04 #10445

merged 4 commits into from Mar 4, 2020

Conversation

jrajahalme
Copy link
Member

@jrajahalme jrajahalme commented Mar 4, 2020

Not backported due to dependencies to non-backported commits:

Once this PR is merged, you can update the PR labels via:

$ for pr in 10283 10325 10322 10434; do contrib/backporting/set-labels.py $pr done 1.5; done

This change is Reviewable

nebril and others added 4 commits March 4, 2020 01:32
[ upstream commit d8443c5 ]

If commit message is not a proper regular expression, check-stable
script crashes (`bpf,option: Fix EPHE**R**MERAL typo` is an example).

This change causes `git log` to not use commit message header as a
regex, but rather use simple string comparison.

Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
…cilium

[ upstream commit 4c40755 ]

Recently Istio PODs have been lingering in terminating state long
after deletion. It appears that kubelet on k8s2-1.17 is not happy that
istio-system namespace has been deleted. Deletion of the namespace
usually automatically deletes all the PODs in it. It may also be that
the termination fails to complete since the Cilium DS is being deleted
right after the istio-system namespace is deleted.

  k8s2 kubelet[3338]: W0225 ... 3338 status_manager.go:546] Failed to update status for pod "istio-citadel-7859cc956c-74474_istio-system(9a0a2875-076b-4670-a9b4-13f92f6c7240)": failed to patch status "... \"state\":{\"terminated\":{\"exitCode\":0,\"finishedAt\":null,\"startedAt\":null}}" for pod "istio-system"/"istio-citadel-7859cc956c-74474": namespaces "istio-system" not found

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit f8b65ed ]

* Fix maintainers little helper link to contributing docs
* Fix contributing link in readme

Fixes: #10316
Signed-off-by: Sean Winn <sean@isovalent.com>
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
[ upstream commit f1a8fc1 ]

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme added pending-review kind/backports This PR provides functionality previously merged into master. release-note/misc This PR makes changes that have no direct user impact. labels Mar 4, 2020
@jrajahalme jrajahalme requested a review from a team as a code owner March 4, 2020 01:43
@jrajahalme
Copy link
Member Author

never-tell-me-the-odds

@joestringer joestringer merged commit e5d20f7 into v1.5 Mar 4, 2020
@joestringer joestringer deleted the pr/v1.5-backport-2020-03-04 branch March 4, 2020 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants