Skip to content

refactor: consolidate redundant spireEnabled checks #365

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
pdettori merged 1 commit into from
May 20, 2026
Merged

refactor: consolidate redundant spireEnabled checks #365

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 15 additions & 16 deletions kagenti-operator/internal/webhook/injector/container_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,21 @@ func (b *ContainerBuilder) BuildEnvoyProxyContainerWithSpireOption(spireEnabled
},
}
if spireEnabled {
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: "svid-output",
MountPath: "/opt",
ReadOnly: true,
})
}

if spireEnabled {
// authbridge-envoy bundles spiffe-helper; the entrypoint reads
// helper.conf from this mount. Without it, the bundled
// spiffe-helper would fail to start on SPIRE_ENABLED=true.
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: "spiffe-helper-config",
MountPath: "/etc/spiffe-helper",
ReadOnly: true,
})
volumeMounts = append(volumeMounts,
corev1.VolumeMount{
Name: "svid-output",
MountPath: "/opt",
ReadOnly: true,
},
// authbridge-envoy bundles spiffe-helper; the entrypoint reads
// helper.conf from this mount. Without it, the bundled
// spiffe-helper would fail to start on SPIRE_ENABLED=true.
corev1.VolumeMount{
Name: "spiffe-helper-config",
MountPath: "/etc/spiffe-helper",
ReadOnly: true,
},
)
}

var env []corev1.EnvVar
Expand Down
Loading