Merge pull request #701 from njhale/group-intersection

fix(csv): only allow one CSV per provided API across intersecting operatorgroups

Author: openshift-merge-robot

Makefile

@@ -179,7 +179,8 @@ release:
 	rm -rf manifests
 	mkdir manifests
 	cp -R deploy/ocp/manifests/$(ver)/. manifests
-	find ./manifests -type f -exec sed -i '' '/^#/d' {} \;
+	find ./manifests -type f -exec sed -i "/^#/d" {} \; 
+	find ./manifests -type f -exec sed -i "1{/---/d}" {} \;
 
 package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver))
 package:

deploy/chart/templates/0000_50_10-olm-operator.deployment.yaml renamed to deploy/chart/templates/0000_50_06-olm-operator.deployment.yaml

@@ -29,7 +29,7 @@ spec:
           properties:
             selector:
               type: object
-              description: Label selector to find resources associated with or managed by the operator
+              description: Optional label selector to find resources associated with or managed by the operator
               properties:
                 matchLabels:
                   type: object
@@ -61,11 +61,15 @@ spec:
                             description: set of values for the expression
             targetNamespaces:
               type: array
+              description: Optional list of target namespaces. If set, OLM will ignore selector.
               items:
                 type: string
                 pattern: ^\S+$
             serviceAccountName:
               type: string
+            staticProvidedAPIs:
+              type: boolean
+              description: If true, OLM will not modify the OperatorGroup's providedAPIs annotation.
           type: object
         status:
           properties:
@@ -81,4 +85,4 @@ spec:
           - lastUpdated
           type: object
       required:
-      - metadata
+      - metadata