Skip to content

Commit 20739d3

Browse files
njhalenjhale
committed
chore(manifests): regenerate manifests to include new validation
Regenerates manifests using `make release` to include new OperatorGroup anyOf validation.
1 parent 90686ec commit 20739d3

File tree

7 files changed

+146
-122
lines changed

7 files changed

+146
-122
lines changed

‎deploy/ocp/manifests/0.8.1/0000_50_olm_09-operatorgroup.crd.yaml

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,41 @@ spec:
3232
selector:
3333
type: object
3434
description: Optional label selector to find resources associated with or managed by the operator
35-
properties:
36-
matchLabels:
37-
type: object
38-
description: Label key:value pairs to match directly
39-
matchExpressions:
40-
type: array
41-
description: A set of expressions to match against the resource.
42-
items:
43-
allOf:
44-
- type: object
45-
required:
46-
- key
47-
- operator
48-
- values
49-
properties:
50-
key:
51-
type: string
52-
description: the key to match
53-
operator:
54-
type: string
55-
description: the operator for the expression
56-
enum:
57-
- In
58-
- NotIn
59-
- Exists
60-
- DoesNotExist
61-
values:
62-
type: array
63-
description: set of values for the expression
35+
anyOf:
36+
- properties:
37+
matchLabels:
38+
type: object
39+
description: Label key:value pairs to match directly
40+
required:
41+
- matchLabels
42+
- properties:
43+
matchExpressions:
44+
type: array
45+
description: A set of expressions to match against the resource.
46+
items:
47+
allOf:
48+
- type: object
49+
required:
50+
- key
51+
- operator
52+
- values
53+
properties:
54+
key:
55+
type: string
56+
description: the key to match
57+
operator:
58+
type: string
59+
description: the operator for the expression
60+
enum:
61+
- In
62+
- NotIn
63+
- Exists
64+
- DoesNotExist
65+
values:
66+
type: array
67+
description: set of values for the expression
68+
required:
69+
- matchExpressions
6470
targetNamespaces:
6571
type: array
6672
description: Optional list of target namespaces. If set, OLM will ignore selector.

‎deploy/ocp/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ package:
3939
beta.kubernetes.io/os: linux
4040
node-role.kubernetes.io/master: ""
4141
tolerations:
42-
- operator: Exists
42+
- operator: Exists

‎deploy/okd/manifests/0.8.1/0000_50_olm_09-operatorgroup.crd.yaml

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,41 @@ spec:
3232
selector:
3333
type: object
3434
description: Optional label selector to find resources associated with or managed by the operator
35-
properties:
36-
matchLabels:
37-
type: object
38-
description: Label key:value pairs to match directly
39-
matchExpressions:
40-
type: array
41-
description: A set of expressions to match against the resource.
42-
items:
43-
allOf:
44-
- type: object
45-
required:
46-
- key
47-
- operator
48-
- values
49-
properties:
50-
key:
51-
type: string
52-
description: the key to match
53-
operator:
54-
type: string
55-
description: the operator for the expression
56-
enum:
57-
- In
58-
- NotIn
59-
- Exists
60-
- DoesNotExist
61-
values:
62-
type: array
63-
description: set of values for the expression
35+
anyOf:
36+
- properties:
37+
matchLabels:
38+
type: object
39+
description: Label key:value pairs to match directly
40+
required:
41+
- matchLabels
42+
- properties:
43+
matchExpressions:
44+
type: array
45+
description: A set of expressions to match against the resource.
46+
items:
47+
allOf:
48+
- type: object
49+
required:
50+
- key
51+
- operator
52+
- values
53+
properties:
54+
key:
55+
type: string
56+
description: the key to match
57+
operator:
58+
type: string
59+
description: the operator for the expression
60+
enum:
61+
- In
62+
- NotIn
63+
- Exists
64+
- DoesNotExist
65+
values:
66+
type: array
67+
description: set of values for the expression
68+
required:
69+
- matchExpressions
6470
targetNamespaces:
6571
type: array
6672
description: Optional list of target namespaces. If set, OLM will ignore selector.

‎deploy/upstream/manifests/0.8.1/0000_50_olm_09-operatorgroup.crd.yaml

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,41 @@ spec:
3232
selector:
3333
type: object
3434
description: Optional label selector to find resources associated with or managed by the operator
35-
properties:
36-
matchLabels:
37-
type: object
38-
description: Label key:value pairs to match directly
39-
matchExpressions:
40-
type: array
41-
description: A set of expressions to match against the resource.
42-
items:
43-
allOf:
44-
- type: object
45-
required:
46-
- key
47-
- operator
48-
- values
49-
properties:
50-
key:
51-
type: string
52-
description: the key to match
53-
operator:
54-
type: string
55-
description: the operator for the expression
56-
enum:
57-
- In
58-
- NotIn
59-
- Exists
60-
- DoesNotExist
61-
values:
62-
type: array
63-
description: set of values for the expression
35+
anyOf:
36+
- properties:
37+
matchLabels:
38+
type: object
39+
description: Label key:value pairs to match directly
40+
required:
41+
- matchLabels
42+
- properties:
43+
matchExpressions:
44+
type: array
45+
description: A set of expressions to match against the resource.
46+
items:
47+
allOf:
48+
- type: object
49+
required:
50+
- key
51+
- operator
52+
- values
53+
properties:
54+
key:
55+
type: string
56+
description: the key to match
57+
operator:
58+
type: string
59+
description: the operator for the expression
60+
enum:
61+
- In
62+
- NotIn
63+
- Exists
64+
- DoesNotExist
65+
values:
66+
type: array
67+
description: set of values for the expression
68+
required:
69+
- matchExpressions
6470
targetNamespaces:
6571
type: array
6672
description: Optional list of target namespaces. If set, OLM will ignore selector.

‎deploy/upstream/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ writeStatusName: '""'
77
olm:
88
replicaCount: 1
99
image:
10-
ref: quay.io/openshift/origin-operator-lifecycle-manager:latest
10+
ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
1111
pullPolicy: IfNotPresent
1212
service:
1313
internalPort: 8080
1414
catalog:
1515
replicaCount: 1
1616
image:
17-
ref: quay.io/openshift/origin-operator-lifecycle-manager:latest
17+
ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
1818
pullPolicy: IfNotPresent
1919
service:
2020
internalPort: 8080
2121
package:
2222
replicaCount: 2
2323
image:
24-
ref: quay.io/openshift/origin-operator-lifecycle-manager:latest
24+
ref: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
2525
pullPolicy: Always
2626
service:
2727
internalPort: 5443

‎manifests/0000_50_olm_09-operatorgroup.crd.yaml

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,41 @@ spec:
3030
selector:
3131
type: object
3232
description: Optional label selector to find resources associated with or managed by the operator
33-
properties:
34-
matchLabels:
35-
type: object
36-
description: Label key:value pairs to match directly
37-
matchExpressions:
38-
type: array
39-
description: A set of expressions to match against the resource.
40-
items:
41-
allOf:
42-
- type: object
43-
required:
44-
- key
45-
- operator
46-
- values
47-
properties:
48-
key:
49-
type: string
50-
description: the key to match
51-
operator:
52-
type: string
53-
description: the operator for the expression
54-
enum:
55-
- In
56-
- NotIn
57-
- Exists
58-
- DoesNotExist
59-
values:
60-
type: array
61-
description: set of values for the expression
33+
anyOf:
34+
- properties:
35+
matchLabels:
36+
type: object
37+
description: Label key:value pairs to match directly
38+
required:
39+
- matchLabels
40+
- properties:
41+
matchExpressions:
42+
type: array
43+
description: A set of expressions to match against the resource.
44+
items:
45+
allOf:
46+
- type: object
47+
required:
48+
- key
49+
- operator
50+
- values
51+
properties:
52+
key:
53+
type: string
54+
description: the key to match
55+
operator:
56+
type: string
57+
description: the operator for the expression
58+
enum:
59+
- In
60+
- NotIn
61+
- Exists
62+
- DoesNotExist
63+
values:
64+
type: array
65+
description: set of values for the expression
66+
required:
67+
- matchExpressions
6268
targetNamespaces:
6369
type: array
6470
description: Optional list of target namespaces. If set, OLM will ignore selector.
@@ -85,4 +91,4 @@ spec:
8591
- lastUpdated
8692
type: object
8793
required:
88-
- metadata
94+
- metadata

‎test/e2e/operator_groups_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ func TestOperatorGroupInstallModeSupport(t *testing.T) {
490490

491491
// Generate operatorGroupA
492492
crc := newCRClient(t)
493-
groupA := newOperatorGroup(nsA, genName("a"), nil, metav1.LabelSelector{}, []string{nsA}, false)
493+
groupA := newOperatorGroup(nsA, genName("a"), nil, nil, []string{nsA}, false)
494494
_, err := crc.OperatorsV1alpha2().OperatorGroups(nsA).Create(groupA)
495495
require.NoError(t, err)
496496
defer func() {

0 commit comments

Comments
 (0)