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.12 Backports 2023-05-15 #25452

Merged
merged 2 commits into from
May 26, 2023
Merged

v1.12 Backports 2023-05-15 #25452

merged 2 commits into from
May 26, 2023

Conversation

jibi
Copy link
Member

@jibi jibi commented May 15, 2023 •
edited by joestringer

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

for pr in 20236 25352; do contrib/backporting/set-labels.py $pr done 1.12; done

or with

make add-labels BRANCH=v1.12 ISSUES=20236,25352

@jibi jibi requested a review from a team as a code owner May 15, 2023 13:16
@jibi jibi added kind/backports This PR provides functionality previously merged into master. backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. labels May 15, 2023
@jibi jibi temporarily deployed to release-base-images May 15, 2023 13:16 — with GitHub Actions Inactive
@jibi jibi force-pushed the pr/v1.12-backport-2023-05-15 branch from f000231 to dfdb287 Compare May 15, 2023 14:01
@jibi jibi removed the request for review from anfernee May 15, 2023 14:02
@jibi jibi marked this pull request as draft May 15, 2023 14:12
@jibi jibi force-pushed the pr/v1.12-backport-2023-05-15 branch 2 times, most recently from 331022f to 9a75a72 Compare May 15, 2023 14:14
@jibi jibi removed the request for review from youngnick May 15, 2023 17:00
@jibi jibi force-pushed the pr/v1.12-backport-2023-05-15 branch 4 times, most recently from 8d4a3db to bb2ff54 Compare May 16, 2023 10:15
@jibi
Copy link
Member Author

jibi commented May 16, 2023

/test-backport-1.12

@jibi jibi marked this pull request as ready for review May 17, 2023 09:40
@jibi jibi force-pushed the pr/v1.12-backport-2023-05-15 branch from bb2ff54 to f2b9593 Compare May 18, 2023 08:30
joestringer and others added 2 commits May 22, 2023 20:58
@joestringer @jibi
Add helm-toolbox image for helm docs, lint
0346a35 
[ upstream commit e4ba2aa ]

Use https://github.com/cilium/helm-toolbox as an image for managing all
of our helm formatting & linting needs.

This implicitly updates:
* helm (version from dev environment) -> 3.9.0
* helm-docs (custom build from Bruno) -> 1.10.0
* m2r 0.2.1 -> m2r2 0.3.2

Backporting conflicts:
* had to rerun `make -C Documentation update-helm-values`

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jrajahalme @jibi
test/provision/compile.sh: Make usable from dev VM
e60425e 
[ upstream commit 0112ddb ]

Add missing 'sudo' commands so that this can be run from a shell in a dev
VM to launch a local cilium agent in docker.

Only install the bpf mount unit to systemd if not already mounted. This
avoids error message like this:

    Unit sys-fs-bpf.mount has a bad unit file setting

With these changes Cilium agent can be compiled and launced in docker,
assuming the VM hostname does NOT include "k8s", like so:

   $ SKIP_TEST_IMAGE_DOWNLOAD=1 VMUSER=${USER} PROVISIONSRC=test/provision test/provision/compile.sh

After this 'docker ps' should show a "cilium" container.

This can be used, for example to quickly run Cilium agent locally to
observer agent startup and exit logs via 'docker logs cilium -f' when
stopping cilium with 'docker stop cilium'.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
@jibi jibi force-pushed the pr/v1.12-backport-2023-05-15 branch from f2b9593 to e60425e Compare May 22, 2023 18:58
@jibi
Copy link
Member Author

jibi commented May 22, 2023

/test-backport-1.12

@jibi
Copy link
Member Author

jibi commented May 23, 2023 •
edited by maintainer-s-little-helper bot

/test-backport-1.12

Job 'Cilium-PR-K8s-1.24-kernel-net-next' failed:

Click to show.

Test Name

K8sEgressGatewayTest tunnel disabled with endpointRoutes enabled no egress gw policy connectivity works

Failure Output

FAIL: Expected command: kubectl exec -n kube-system log-gatherer-rnt7g -- curl --path-as-is -s -D /dev/stderr --fail --connect-timeout 5 --max-time 20 http://10.0.1.38:80 -w "time-> DNS: '%{time_namelookup}(%{remote_ip})', Connect: '%{time_connect}',Transfer '%{time_starttransfer}', total '%{time_total}'"

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.24-kernel-net-next/6/

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

Then please upload the Jenkins artifacts to that issue.

@jibi
Copy link
Member Author

jibi commented May 24, 2023

/test-1.24-net-next

@jibi jibi mentioned this pull request May 25, 2023
Closed
5 tasks
tklauser
tklauser approved these changes May 26, 2023
View reviewed changes
Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Checked both commits that they correspond to their respective upstream commit. Re-generated helm values look sound as well.

@jrajahalme
Copy link
Member

/ci-l4lb-1.12

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 26, 2023
@joestringer joestringer merged commit b5bd77c into v1.12 May 26, 2023
56 checks passed
@joestringer joestringer deleted the pr/v1.12-backport-2023-05-15 branch May 26, 2023 18:44
This was referenced Jun 12, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tklauser tklauser tklauser approved these changes

@joestringer joestringer joestringer approved these changes

@jrajahalme jrajahalme jrajahalme approved these changes

Assignees
No one assigned
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jibi @jrajahalme @tklauser @joestringer