Skip to content

Merge main into canton-3.4 #2754

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

Merged
merged 2 commits into from
Oct 20, 2025
Merged

Merge main into canton-3.4 #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a7d4d7
Add config for enabling access logging across the entire cluster (#2747)
rautenrieth-da Oct 17, 2025
02629e7
Merge remote-tracking branch 'origin/main' into martinflorian-da/cni-…
martinflorian-da Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cluster/pulumi/infra/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export const InfraConfigSchema = z.object({
}),
istio: z.object({
enableIngressAccessLogging: z.boolean(),
enableClusterAccessLogging: z.boolean().default(false),
}),
extraCustomResources: z.object({}).catchall(z.any()).default({}),
}),
Expand Down
4 changes: 1 addition & 3 deletions cluster/pulumi/infra/src/istio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,8 @@ function configureIstiod(
},
// https://istio.io/latest/docs/reference/config/istio.mesh.v1alpha1/
meshConfig: {
// Uncomment to turn on access logging across the entire cluster (we disabled it by default to reduce cost):
// accessLogFile: '/dev/stdout',
// taken from https://github.com/istio/istio/issues/37682
accessLogFile: '',
accessLogFile: infraConfig.istio.enableClusterAccessLogging ? '/dev/stdout' : '',
accessLogEncoding: 'JSON',
// https://istio.io/latest/docs/ops/integrations/prometheus/#option-1-metrics-merging disable as we don't use annotations
enablePrometheusMerge: false,
Expand Down
Loading