[ upstream commit 2a3bb63 ]

This shorter timeout seems to be too short for the tests to be
successful. We should increase them and see if the flakiness decreases.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

[ upstream commit e014ca0 ]

Since introduction of base-SHA as required dispatch argument, triggering
that workflow started failing on branch 1.19 as we were not providing
it.

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

[ upstream commit 0c24f26 ]

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

[ 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>

….TCP)

[ upstream commit 3b0defb ]

When multiple oneof variants are specified in a field mask (e.g., both
TCP and UDP), the previous implementation would copy all variants,
creating spurious structures for inactive ones. This caused identical
flows to generate different aggregation keys.

Added oneof-aware copying using WhichOneof() to only copy the active
variant, preventing spurious structures and ensuring consistent keys.

Signed-off-by: mereta <mereta.degutyte@hotmail.co.uk>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

…ontext

[ upstream commit 4549ee8 ]

Aggregation only keeps and aggregates on the fields specified in the fieldAggregate.
There is no way to preserve a timestamp, and specifying time in fieldAggregate defeats aggregation.
The solution is to preserve the 1st occurring timestamp in the processedFlow after the aggregation key is generated.
The aggregation logic is not affected and temporal context is preserved.

Signed-off-by: mereta <mereta.degutyte@hotmail.co.uk>
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>

[ upstream commit c3b621c ]

This commit will update the status of a policy if it contains auth rules
when the feature is disabled, so that the user is warned about the fact
that the auth rule is ineffective.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>

[ upstream commit 9927bda ]

The grep output being printed here added noise to the build process
without any actionable outcomes. Hide it by using "grep -q".

Fixes: 0b0cfc7 ("chore: Add a linter for non-idempotent secrets")
Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>