Manage namespace in kustomization for subscriptions

Let's be consistent about where we're setting namespaces for operator subscriptions.
larsks · Jun 18, 2022 · 4e40409 · 4e40409
1 parent b045570
commit 4e40409
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 7 deletions.
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/acm/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/acm/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: open-cluster-management
 resources:
 - subscription.yaml
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/acm/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/acm/subscription.yaml
@@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
     name: acm
-    namespace: open-cluster-management
 spec:
     channel: release-2.5
     installPlanApproval: Automatic

diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: openshift-operators
 resources:
 - subscription.yaml
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/subscription.yaml
@@ -1,10 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-    labels:
-        operators.coreos.com/ocs-operator.cert-manager: ""
     name: cert-manager
-    namespace: openshift-operators
 spec:
     channel: stable
     installPlanApproval: Automatic

diff --git a/...cope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/kustomization.yaml b/...cope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: openshift-operators
 resources:
     - subscription.yaml
diff --git a/...scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/subscription.yaml b/...scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/subscription.yaml
@@ -1,10 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  labels:
-    operators.coreos.com/openshift-gitops-operator.openshift-operators: ""
   name: openshift-gitops-operator
-  namespace: openshift-operators
 spec:
   channel: stable
   installPlanApproval: Automatic