Skip to content

v1.18 Backports 2026-01-26#44004

Merged
mhofstetter merged 2 commits intov1.18from
pr/v1.18-backport-2026-01-26-09-24
Jan 26, 2026
Merged

v1.18 Backports 2026-01-26#44004
mhofstetter merged 2 commits intov1.18from
pr/v1.18-backport-2026-01-26-09-24

Conversation

@mhofstetter
Copy link
Copy Markdown
Member

@mhofstetter mhofstetter commented Jan 26, 2026

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

 43921 43644

giorio94 and others added 2 commits January 26, 2026 09:25
[ upstream commit 2c72678 ]

The CiliumEndpointSlice migration workflow is currently run on schedule
on the main branch. However, it is not being triggered for stable branches,
because it is not part of the test suite triggered via /test. Let's get
this divergence fixed adding it to the list of nightly workflows, so that
it gets periodically run on stable branches as well.

Reported-by: André Martins <andre@cilium.io>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
[ upstream commit 063e40c ]

Add support for configuring Hubble Relay log format and level through Helm values, similar to the existing logOptions support in cilium-agent and cilium-operator.

This allows users to enable JSON logging for Hubble Relay, which is useful for log aggregation tools in environments like AWS EKS.

New Helm values:
- hubble.relay.logOptions.format: text, text-ts, json, json-ts
- hubble.relay.logOptions.level: debug, info, warn, error

Fixes: #43009
Signed-off-by: Pavan More <pavansmore05@gmail.com>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
@mhofstetter mhofstetter added kind/backports This PR provides functionality previously merged into master. backport/1.18 This PR represents a backport for Cilium 1.18.x of a PR that was merged to main. labels Jan 26, 2026
@mhofstetter
Copy link
Copy Markdown
Member Author

@Artyop would be great if you could double-check the backport of #43644 (you were the helm reviewer on the original pr)

@mhofstetter
Copy link
Copy Markdown
Member Author

/test

Copy link
Copy Markdown
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

Thanks, my commit looks good.

@mhofstetter mhofstetter marked this pull request as ready for review January 26, 2026 09:02
@mhofstetter mhofstetter requested review from a team as code owners January 26, 2026 09:02
@Artyop
Copy link
Copy Markdown
Contributor

Artyop commented Jan 26, 2026

@Artyop would be great if you could double-check the backport of #43644 (you were the helm reviewer on the original pr)

double checked the diff and everything looks great, thanks 🙏

@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 Jan 26, 2026
@mhofstetter mhofstetter added this pull request to the merge queue Jan 26, 2026
Merged via the queue into v1.18 with commit 77b1922 Jan 26, 2026
410 of 413 checks passed
@mhofstetter mhofstetter deleted the pr/v1.18-backport-2026-01-26-09-24 branch January 26, 2026 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.18 This PR represents a backport for Cilium 1.18.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

Development

Successfully merging this pull request may close these issues.

5 participants