Skip to content

Commit 5439461

Browse files
committed
fix(csv): only allow one CSV per provided API across intersecting
operatorgroups
1 parent 72dbe0d commit 5439461

File tree

106 files changed

+3670
-469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+3670
-469
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ release:
179179
rm -rf manifests
180180
mkdir manifests
181181
cp -R deploy/ocp/manifests/$(ver)/. manifests
182-
find ./manifests -type f -exec sed -i '' '/^#/d' {} \;
182+
find ./manifests -type f -exec sed -i "/^#/d" {} \;
183+
find ./manifests -type f -exec sed -i "1{/---/d}" {} \;
183184

184185
package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver))
185186
package:

deploy/chart/templates/0000_50_13-operatorgroup.crd.yaml renamed to deploy/chart/templates/0000_50_09-operatorgroup.crd.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
properties:
3030
selector:
3131
type: object
32-
description: Label selector to find resources associated with or managed by the operator
32+
description: Optional label selector to find resources associated with or managed by the operator
3333
properties:
3434
matchLabels:
3535
type: object
@@ -61,11 +61,15 @@ spec:
6161
description: set of values for the expression
6262
targetNamespaces:
6363
type: array
64+
description: Optional list of target namespaces. If set, OLM will ignore selector.
6465
items:
6566
type: string
6667
pattern: ^\S+$
6768
serviceAccountName:
6869
type: string
70+
staticProvidedAPIs:
71+
type: boolean
72+
description: If true, OLM will not modify the OperatorGroup's providedAPIs annotation.
6973
type: object
7074
status:
7175
properties:
@@ -81,4 +85,4 @@ spec:
8185
- lastUpdated
8286
type: object
8387
required:
84-
- metadata
88+
- metadata

0 commit comments

Comments
 (0)