Skip to content

Refactor(webhook): remove AgentRuntimeOverrides from injection path #427

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

Open
r3v5 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Refactor(webhook): remove AgentRuntimeOverrides from injection path #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64cd0c5
refactor(webhook): remove AgentRuntimeOverrides from webhook injectio…
r3v5 Jun 12, 2026
2d6d6d6
test(webhook): update tests for 2-layer config model
r3v5 Jun 12, 2026
9cc1b0c
test(webhook): update pod_mutator_test for 2-layer config model
r3v5 Jun 12, 2026
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
135 changes: 0 additions & 135 deletions kagenti-operator/internal/webhook/injector/agentruntime_config.go
View file
Open in desktop

This file was deleted.

185 changes: 0 additions & 185 deletions kagenti-operator/internal/webhook/injector/agentruntime_config_test.go
View file
Open in desktop

This file was deleted.

24 changes: 11 additions & 13 deletions kagenti-operator/internal/webhook/injector/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ const (
LabelClientRegistrationInject = "kagenti.io/client-registration-inject"
)

// AuthBridge deployment modes. Selected per workload via AgentRuntime
// CR `Spec.AuthBridgeMode`, falling back to the namespace
// AuthBridge deployment modes. Selected via the namespace
// `authbridge-runtime-config` ConfigMap's `mode` field, the deprecated
// per-pod annotation, then ModeProxySidecar as the cluster-wide default.
const (
Expand All @@ -22,12 +21,12 @@ const (
ModeWaypoint = "waypoint" // standalone deployment (not injected)

// AnnotationAuthBridgeMode is the legacy per-pod mode selector. The
// canonical surface is now AgentRuntime.Spec.AuthBridgeMode and the
// namespace authbridge-runtime-config ConfigMap; this annotation is
// only honored as a deprecated fallback so existing deployments do
// not silently shape-shift to a different mode on first redeploy.
// canonical surface is the namespace authbridge-runtime-config
// ConfigMap; this annotation is only honored as a deprecated fallback
// so existing deployments do not silently shape-shift to a different
// mode on first redeploy.
//
// Deprecated: set Spec.AuthBridgeMode on the AgentRuntime CR.
// Deprecated: set mode in the namespace authbridge-runtime-config ConfigMap.
AnnotationAuthBridgeMode = "kagenti.io/authbridge-mode"

// Container name for proxy-sidecar mode
Expand Down Expand Up @@ -57,12 +56,11 @@ const (
ProxyInitModeEnforceRedirect ProxyInitMode = "enforce-redirect"
)

// mTLS modes for the proxy-sidecar / lite paths. Selected per workload
// via AgentRuntime CR `Spec.MTLSMode`, falling back to the namespace
// `authbridge-runtime-config` ConfigMap's `mtls.mode` field, then
// MTLSModeDisabled. envoy-sidecar mode is incompatible with mTLS today
// (Envoy SDS not configured by the kagenti envoy-config) — admission
// rejects mtlsMode != disabled in that combination.
// mTLS modes for the proxy-sidecar / lite paths. Selected via the
// namespace `authbridge-runtime-config` ConfigMap's `mtls.mode` field,
// then MTLSModeDisabled. envoy-sidecar mode is incompatible with mTLS
// today (Envoy SDS not configured by the kagenti envoy-config) —
// admission rejects mtlsMode != disabled in that combination.
const (
MTLSModeDisabled = "disabled"
MTLSModePermissive = "permissive"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -62,7 +62,7 @@ func NewContainerBuilder(cfg *config.PlatformConfig) *ContainerBuilder {
// env var values from the resolved config (admission-time resolution).
func NewResolvedContainerBuilder(resolved *ResolvedConfig) *ContainerBuilder {
if resolved == nil {
resolved = ResolveConfig(nil, nil, nil)
resolved = ResolveConfig(nil, nil)
}
return &ContainerBuilder{
cfg: resolved.Platform,
Expand Down
Loading
Loading