chore: use deployment's namespace pass down to pod as operator namesp…

…ace (#1139) - fallback to use /var/run file if not get value Signed-off-by: Wen Zhou <[email protected]>
opendatahub-io · Jul 24, 2024 · a08c94a · a08c94a
1 parent 7034768
commit a08c94a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
@@ -1706,6 +1706,10 @@ spec:
                 env:
                 - name: DISABLE_DSC_CONFIG
                   value: "true"
+                - name: OPERATOR_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.namespace
                 image: REPLACE_IMAGE:latest
                 imagePullPolicy: Always
                 livenessProbe:

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -40,6 +40,10 @@ spec:
         env:
           - name: DISABLE_DSC_CONFIG
             value: 'true'
+          - name: OPERATOR_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
         args:
         - --operator-name=opendatahub
         image: controller:latest

diff --git a/pkg/cluster/cluster_config.go b/pkg/cluster/cluster_config.go
@@ -41,6 +41,10 @@ func GetDomain(ctx context.Context, c client.Client) (string, error) {
 }
 
 func GetOperatorNamespace() (string, error) {
+	operatorNS, exist := os.LookupEnv("OPERATOR_NAMESPACE")
+	if exist && operatorNS != "" {
+		return operatorNS, nil
+	}
 	data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
 	return string(data), err
 }