Merge pull request OCP-on-NERC#14 from larsks/feature/cleanup

Apply some minor cleanups

.gitignore

@@ -0,0 +1 @@
+**/overlays/*-local/

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

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

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

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

cluster-scope/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

cluster-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

cluster-scope/overlays/common/kustomization.yaml

@@ -3,4 +3,5 @@ kind: Kustomization
 resources:
 - machineconfigs/99-master-ssh.yaml
 - machineconfigs/99-worker-ssh.yaml
+- ../../base/operators.coreos.com/subscriptions/cert-manager
 - ../../base/operators.coreos.com/subscriptions/external-secrets-operator

cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml

@@ -1,8 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonLabels:
+  nerc.mghpcc.org/kustomized: "true"
 resources:
 - ../common
 - ../../bundles/openshift-gitops
 - ../../bundles/acm
-- ../../base/operators.coreos.com/subscriptions/cert-manager
 - clusterversion.yaml