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 2024-02-16 #30801

Merged
merged 2 commits into from Feb 18, 2024
Merged

v1.13 Backports 2024-02-16 #30801

merged 2 commits into from Feb 18, 2024

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Feb 16, 2024 •
edited by pchaigno

Once this PR is merged, a GitHub action will update the labels of these PRs:

 30151 30759

@pchaigno @sayboras
docs: Document XfrmInStateInvalid errors
699a33c 
[ upstream commit c19a84e ]

This error can happen if a state is being destroyed while packets are in
flight. It should be rare as the window in the kernel where it can
happen is very short.

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@pchaigno @sayboras
workflows: Clean IPsec test output
1a4105b 
[ upstream commit 3c479d4 ]

The test output are riddled with logs such as:

    Defaulted container "cilium-agent" out of: cilium-agent, config
    (init), mount-cgroup (init), apply-sysctl-overwrites (init),
    mount-bpf-fs (init), clean-cilium-state (init),
    install-cni-binaries (init)

This gets particularly noisy when waiting for the key rotation to
complete, during which time we run kubectl exec repeatedly. This commit
fixes it.

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Feb 16, 2024
@sayboras
Copy link
Member Author

sayboras commented Feb 16, 2024 •
edited by maintainer-s-little-helper bot

/test-backport-1.13

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

Click to show.

Test Name

K8sDatapathConfig MonitorAggregation Checks that monitor aggregation restricts notifications

Failure Output

FAIL: Error creating resource /home/jenkins/workspace/Cilium-PR-K8s-1.23-kernel-4.19/src/github.com/cilium/cilium/test/k8s/manifests/l3-policy-demo.yaml: Cannot retrieve cilium pod cilium-tqqd5 policy revision: cannot get the revision

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.23-kernel-4.19/660/

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.19 so I can create one.

Then please upload the Jenkins artifacts to that issue.

Job 'Cilium-PR-K8s-1.23-kernel-4.19' hit: #30802 (96.12% similarity)

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

Click to show.

Test Name

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

Failure Output

FAIL: Timed out after 30.013s.

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.23-kernel-4.19/663/

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.19 so I can create one.

Then please upload the Jenkins artifacts to that issue.

@sayboras sayboras marked this pull request as ready for review February 16, 2024 01:21
@sayboras sayboras requested review from a team as code owners February 16, 2024 01:21
@sayboras
Copy link
Member Author

sayboras commented Feb 16, 2024 •
edited by maintainer-s-little-helper bot

/mlh new-flake Cilium-PR-K8s-1.23-kernel-4.19

👍 created #30802

@sayboras
Copy link
Member Author

/test-1.23-4.19

@maintainer-s-little-helper maintainer-s-little-helper bot mentioned this pull request Feb 16, 2024
Open
pchaigno
pchaigno approved these changes Feb 16, 2024
View reviewed changes
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

Thanks Tam!

@sayboras sayboras added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 16, 2024
@aanm
Copy link
Member

aanm commented Feb 16, 2024

/test-1.23-4.19

1 similar comment
@aanm
Copy link
Member

aanm commented Feb 17, 2024

/test-1.23-4.19

@maintainer-s-little-helper maintainer-s-little-helper bot removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 17, 2024
@sayboras sayboras added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 17, 2024
@sayboras
Copy link
Member Author

All the tests are passed now, not sure why the bot removed ready to merge label, manually add it back.

@aanm aanm merged commit 6ce6f9a into v1.13 Feb 18, 2024
81 checks passed
@aanm aanm deleted the pr/v1.13-backport-2024-02-16 branch February 18, 2024 14:28
@maintainer-s-little-helper maintainer-s-little-helper bot removed ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Feb 18, 2024
This was referenced Mar 13, 2024
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pchaigno pchaigno pchaigno approved these changes

@aanm aanm aanm approved these changes

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sayboras @aanm @pchaigno