add namespace field in sa, and update watch namespace

Signed-off-by: Allen Li <[email protected]>

helm/templates/operator-deployment.yaml

@@ -196,10 +196,9 @@ spec:
               fieldPath: metadata.namespace
         - name: WATCH_NAMESPACE
           valueFrom:
-            configMapKeyRef:
-              key: namespaces
-              name: namespace-scope
-              optional: true
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
         # this might be remove in non-olm env
         - name: OPERATOR_CONDITION_NAME
           value: operand-deployment-lifecycle-manager.v4.3.9

helm/templates/rbac.yaml

@@ -218,3 +218,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: operand-deployment-lifecycle-manager
+  namespace: {{ .Values.operatorNamespace }}