From d1280c94837d2f1eaae1d3d36f9a034bc834a8fc Mon Sep 17 00:00:00 2001 From: user Date: Thu, 23 Apr 2026 15:42:38 -0400 Subject: [PATCH] fix(control-plane): fix CP_RUNTIME_NAMESPACE defaulting to MPP namespace on vanilla OpenShift MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CP_RUNTIME_NAMESPACE defaulted to "ambient-code--runtime-int" (MPP-specific) in Go code, causing crashloop on vanilla OpenShift where that namespace doesn't exist. Fix by falling back to NAMESPACE env var (or "ambient-code") and adding downward API to the base manifest. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- components/ambient-control-plane/internal/config/config.go | 2 +- components/manifests/base/ambient-control-plane-service.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/ambient-control-plane/internal/config/config.go b/components/ambient-control-plane/internal/config/config.go index c69faa0f1..7a0f606d2 100644 --- a/components/ambient-control-plane/internal/config/config.go +++ b/components/ambient-control-plane/internal/config/config.go @@ -55,7 +55,7 @@ func Load() (*ControlPlaneConfig, error) { Mode: envOrDefault("MODE", "kube"), PlatformMode: envOrDefault("PLATFORM_MODE", "standard"), MPPConfigNamespace: envOrDefault("MPP_CONFIG_NAMESPACE", "ambient-code--config"), - CPRuntimeNamespace: envOrDefault("CP_RUNTIME_NAMESPACE", "ambient-code--runtime-int"), + CPRuntimeNamespace: envOrDefault("CP_RUNTIME_NAMESPACE", envOrDefault("NAMESPACE", "ambient-code")), OIDCTokenURL: envOrDefault("OIDC_TOKEN_URL", "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token"), OIDCClientID: os.Getenv("OIDC_CLIENT_ID"), OIDCClientSecret: os.Getenv("OIDC_CLIENT_SECRET"), diff --git a/components/manifests/base/ambient-control-plane-service.yml b/components/manifests/base/ambient-control-plane-service.yml index 6ed2783c7..3799ed8dc 100644 --- a/components/manifests/base/ambient-control-plane-service.yml +++ b/components/manifests/base/ambient-control-plane-service.yml @@ -45,6 +45,10 @@ spec: value: "kube" - name: LOG_LEVEL value: "info" + - name: CP_RUNTIME_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace resources: requests: cpu: 50m