From 50425ed8850a528df40ddaea2552d7e5ee2c2131 Mon Sep 17 00:00:00 2001
From: Dahlia Bock <dlbock@gmail.com>
Date: Fri, 4 Sep 2020 10:34:58 -0500
Subject: [PATCH] The 'metadata.namespace' field in the
 CustomResourceDefinition is actually the field not permitted in
 https://github.com/operator-framework/community-operators.

Revert "The CI build that's triggered on PRs for https://github.com/operator-framework/community-operators don't seem to like the 'metadata.namespace' field in the clusterserviceversion.yaml"

This reverts commit fbe8182320aa0e3c8f94c6a812aa45dda7f81b4f.
---
 .DS_Store                                        | Bin 6148 -> 0 bytes
 .../instana-agent-operator.yaml                  |   1 -
 olm/template.jsonnet                             |   2 +-
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index ee771938787a1bb39cadddab0eb4f7463f2ead2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKI|>3Z5S>vG!N$@uSMUZw^aOhW1;s`bM6I{-TprCgpGH?ZZR8D1UNV`NkXP*N
zh=|TFo0-T&L`HB!x!KS)+c)o6FCz+s<BYAGug&SOKOT0S?DqlV4&^LsImzyYZ+kQ<
zKn17(6`%rC;JXTBeI1Rzdn`|*0#x7+6tM3@fg9GuHqbvE7`z1l4iI+3+<OUNu>i0p
zwt<MiG^oI!YPJ{}bi_;M)x<V1=%U$tXx^;Zp{U=E^NXj8)<BL_fC@Y-(2wQB>i-h{
zq5pp-aYY5Fz+Wk#gGIBL<4IXtJCCzkTi`3W<=o+Bm^%f7mt&xpV=Sy3PdzE}ip{ZK
V6Wc(iBkpt{e+En!8Ws4p0uNe26{i3I

diff --git a/olm/operator-resources/instana-agent-operator.yaml b/olm/operator-resources/instana-agent-operator.yaml
index aa282ac6..0fffaf29 100644
--- a/olm/operator-resources/instana-agent-operator.yaml
+++ b/olm/operator-resources/instana-agent-operator.yaml
@@ -174,7 +174,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: agents.instana.io
-  namespace: instana-agent
   labels:
     app.kubernetes.io/name: instana-agent-operator
 spec:
diff --git a/olm/template.jsonnet b/olm/template.jsonnet
index 2510ace1..3a194b8e 100644
--- a/olm/template.jsonnet
+++ b/olm/template.jsonnet
@@ -69,7 +69,7 @@ local crdWithDescriptors = {
 				"capabilities": "Basic Install"
 			},
 			"name": "instana-agent-operator.v" + version,
-			[if redhat then "namespace"]: "placeholder"
+			"namespace": "placeholder"
 		},
 		"spec": {
 			"displayName": "Instana Agent Operator",