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.

Sign up for GitHub

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

Jump to bottom

v1.13 Backports 2023-03-15 #24387

Merged
merged 2 commits into from
Mar 15, 2023
Merged

v1.13 Backports 2023-03-15 #24387

merged 2 commits into from
Mar 15, 2023

Conversation

nebril
Copy link
Member

@nebril nebril commented Mar 15, 2023

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

for pr in 24085; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=24085

@tommyp1ckles @nebril
daemon: fix panic when running with etcd with endpoint crd disabled
976e52b 
[ upstream commit ee7f12c ]

When running etcd kvstore, if endpoint CRD is disabled then
the stale CEP cleanup init procedure panics due to a nil
indexer references returned from k8s watchers.
This is because the cep/ces k8s watchers aren't initialized if
this option is set to true.

Fixes: #24366

Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
@tommyp1ckles @nebril
cmd/ciliumendpoint: guard against nil indexers.
3b3709a 
[ upstream commit f5c202d ]

Make cleanup more resilient to conditions where indexer are not set.

Signed-off-by: Tom Hadlaw <tom.hadlaw@isovalent.com>
Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
@nebril nebril requested a review from a team as a code owner March 15, 2023 12:34
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Mar 15, 2023
@nebril
Copy link
Member Author

nebril commented Mar 15, 2023 •
edited by maintainer-s-little-helper bot
Loading

/test-backport-1.13

Job 'Cilium-PR-K8s-1.23-kernel-4.9' failed:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: migrate-svc restart count values do not match

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.23-kernel-4.9 so I can create one.

Job 'Cilium-PR-K8s-1.24-kernel-4.9' failed:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: migrate-svc restart count values do not match

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.24-kernel-4.9 so I can create one.

Job 'Cilium-PR-K8s-1.21-kernel-4.9' failed:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: migrate-svc restart count values do not match

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.21-kernel-4.9 so I can create one.

Job 'Cilium-PR-K8s-1.19-kernel-4.9' failed:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: migrate-svc restart count values do not match

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.19-kernel-4.9 so I can create one.

Job 'Cilium-PR-K8s-1.18-kernel-4.9' failed:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: migrate-svc restart count values do not match

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.18-kernel-4.9 so I can create one.

Job 'Cilium-PR-K8s-1.22-kernel-4.9' failed:

Click to show.

Test Name

K8sUpdates Tests upgrade and downgrade from a Cilium stable image to master

Failure Output

FAIL: migrate-svc restart count values do not match

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.22-kernel-4.9 so I can create one.

Job 'Cilium-PR-K8s-1.16-kernel-4.9' has 1 failure but they might be new flake since it also hit 1 known flake: #22578 (97.53)

@nebril
Copy link
Member Author

nebril commented Mar 15, 2023

Looks like we hit #24379 on almost all jenkins jobs 🤔

@nebril
Copy link
Member Author

nebril commented Mar 15, 2023 •
edited
Loading

That's ok, the branch doesn't include #24336 (it was backported to 1.13 in parallel), which fixes this behaviour. We should be good to merge after we confirm nothing else is broken.

@nebril
Copy link
Member Author

nebril commented Mar 15, 2023

k8s-1.17-kernel-4.9 had additional etcd timeout, not relevant to PR

@maintainer-s-little-helper maintainer-s-little-helper bot mentioned this pull request Mar 15, 2023
Closed
@nebril nebril added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 15, 2023
@nebril nebril merged commit bffe5eb into v1.13 Mar 15, 2023
@nebril nebril deleted the pr/v1.13-backport-2023-03-15 branch March 15, 2023 18:13
@nebril nebril mentioned this pull request Mar 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrajahalme jrajahalme jrajahalme approved these changes

@michi-covalent michi-covalent michi-covalent approved these changes

@tommyp1ckles tommyp1ckles Awaiting requested review from tommyp1ckles

Assignees
No one assigned
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
No open projects
cilium v1.13.1
Status: Released
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nebril @jrajahalme @michi-covalent @tommyp1ckles