Simplify by specifying watch namespace with metadata

application-stacks · Dec 2, 2021 · c37274a · c37274a
1 parent f2bc778
commit c37274a
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 29 deletions.
diff --git a/deploy/kustomize/daily/examples/watch-another-namespace/rco-deployment.yaml b/deploy/kustomize/daily/examples/watch-another-namespace/rco-deployment.yaml
@@ -11,3 +11,4 @@ spec:
           env:
             - name: WATCH_NAMESPACE
               value: rco-watched-ns2
+              valueFrom:
diff --git a/deploy/kustomize/daily/examples/watch-own-namespace/kustomization.yaml b/deploy/kustomize/daily/examples/watch-own-namespace/kustomization.yaml
@@ -6,5 +6,3 @@ namespace: rco-ns
 bases:
 - ../../base
 
-patchesStrategicMerge:
-- rco-test-project.yaml
diff --git a/deploy/kustomize/daily/examples/watch-own-namespace/rco-test-project.yaml b/deploy/kustomize/daily/examples/watch-own-namespace/rco-test-project.yaml
diff --git a/deploy/kustomize/daily/overlays/watch-all-namespaces/rco-all-namespaces.yaml b/deploy/kustomize/daily/overlays/watch-all-namespaces/rco-all-namespaces.yaml
@@ -10,3 +10,5 @@ spec:
           env:
             - name: WATCH_NAMESPACE
               value: ""
+              valueFrom:
+
diff --git a/deploy/kustomize/daily/overlays/watch-another-namespace/rco-deployment.yaml b/deploy/kustomize/daily/overlays/watch-another-namespace/rco-deployment.yaml
@@ -11,3 +11,5 @@ spec:
           env:
             - name: WATCH_NAMESPACE
               value: rco-watched-ns
+              valueFrom:
+
diff --git a/deploy/releases/0.8.0/kustomize/base/runtime-component-operator.yaml b/deploy/releases/0.8.0/kustomize/base/runtime-component-operator.yaml
@@ -222,7 +222,9 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: WATCH_NAMESPACE
-          value: default
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         image: applicationstacks/operator:0.8.0
         imagePullPolicy: Always
         name: manager

diff --git a/deploy/releases/0.8.0/kustomize/examples/watch-another-namespace/rco-deployment.yaml b/deploy/releases/0.8.0/kustomize/examples/watch-another-namespace/rco-deployment.yaml
@@ -11,3 +11,4 @@ spec:
           env:
             - name: WATCH_NAMESPACE
               value: rco-watched-ns2
+              valueFrom:
diff --git a/deploy/releases/0.8.0/kustomize/examples/watch-own-namespace/kustomization.yaml b/deploy/releases/0.8.0/kustomize/examples/watch-own-namespace/kustomization.yaml
@@ -6,5 +6,3 @@ namespace: rco-ns
 bases:
 - ../../base
 
-patchesStrategicMerge:
-- rco-test-project.yaml
diff --git a/deploy/releases/0.8.0/kustomize/examples/watch-own-namespace/rco-test-project.yaml b/deploy/releases/0.8.0/kustomize/examples/watch-own-namespace/rco-test-project.yaml
diff --git a/deploy/releases/0.8.0/kustomize/overlays/watch-all-namespaces/rco-all-namespaces.yaml b/deploy/releases/0.8.0/kustomize/overlays/watch-all-namespaces/rco-all-namespaces.yaml
@@ -10,3 +10,4 @@ spec:
           env:
             - name: WATCH_NAMESPACE
               value: ""
+              valueFrom:
diff --git a/deploy/releases/0.8.0/kustomize/overlays/watch-another-namespace/rco-deployment.yaml b/deploy/releases/0.8.0/kustomize/overlays/watch-another-namespace/rco-deployment.yaml
@@ -11,3 +11,4 @@ spec:
           env:
             - name: WATCH_NAMESPACE
               value: rco-watched-ns
+              valueFrom: