Skip to content

Commit 23e1f17

Browse files
author
Per Goncalves da Silva
committed
update test bundles and catalog to a declarative config
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent fa8824c commit 23e1f17

File tree

19 files changed

+384
-0
lines changed

19 files changed

+384
-0
lines changed

‎test/images/busybox-index/busybox-dependency/1.0.0/dockerfile renamed to ‎test/images/busybox-index/bundles/busybox-dependency/1.0.0/dockerfile

File renamed without changes.

‎test/images/busybox-index/busybox-dependency/1.0.0/manifests/csv.yaml renamed to ‎test/images/busybox-index/bundles/busybox-dependency/1.0.0/manifests/csv.yaml

File renamed without changes.

‎test/images/busybox-index/busybox-dependency/1.0.0/manifests/foo.crd.yaml renamed to ‎test/images/busybox-index/bundles/busybox-dependency/1.0.0/manifests/foo.crd.yaml

File renamed without changes.

‎test/images/busybox-index/busybox-dependency/1.0.0/metadata/annotations.yaml renamed to ‎test/images/busybox-index/bundles/busybox-dependency/1.0.0/metadata/annotations.yaml

File renamed without changes.

‎test/images/busybox-index/busybox-dependency/2.0.0/dockerfile renamed to ‎test/images/busybox-index/bundles/busybox-dependency/2.0.0/dockerfile

File renamed without changes.

‎test/images/busybox-index/busybox-dependency/2.0.0/manifests/csv.yaml renamed to ‎test/images/busybox-index/bundles/busybox-dependency/2.0.0/manifests/csv.yaml

File renamed without changes.

‎test/images/busybox-index/busybox-dependency/2.0.0/manifests/foo.crd.yaml renamed to ‎test/images/busybox-index/bundles/busybox-dependency/2.0.0/manifests/foo.crd.yaml

File renamed without changes.

‎test/images/busybox-index/busybox-dependency/2.0.0/metadata/annotations.yaml renamed to ‎test/images/busybox-index/bundles/busybox-dependency/2.0.0/metadata/annotations.yaml

File renamed without changes.

‎test/images/busybox-index/busybox/1.0.0/dockerfile renamed to ‎test/images/busybox-index/bundles/busybox/1.0.0/dockerfile

File renamed without changes.

‎test/images/busybox-index/busybox/1.0.0/manifests/csv.yaml renamed to ‎test/images/busybox-index/bundles/busybox/1.0.0/manifests/csv.yaml

File renamed without changes.

‎test/images/busybox-index/busybox/1.0.0/metadata/annotations.yaml renamed to ‎test/images/busybox-index/bundles/busybox/1.0.0/metadata/annotations.yaml

File renamed without changes.

‎test/images/busybox-index/busybox/2.0.0/dockerfile renamed to ‎test/images/busybox-index/bundles/busybox/2.0.0/dockerfile

File renamed without changes.

‎test/images/busybox-index/busybox/2.0.0/manifests/csv.yaml renamed to ‎test/images/busybox-index/bundles/busybox/2.0.0/manifests/csv.yaml

File renamed without changes.

‎test/images/busybox-index/busybox/2.0.0/metadata/annotations.yaml renamed to ‎test/images/busybox-index/bundles/busybox/2.0.0/metadata/annotations.yaml

File renamed without changes.

‎test/images/busybox-index/index.Dockerfile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# The base image is expected to contain
2+
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
3+
ARG OPM_VERSION=latest
4+
FROM quay.io/operator-framework/opm:${OPM_VERSION}
5+
6+
# Set DC-specific label for the location of the DC root directory
7+
# in the image
8+
LABEL operators.operatorframework.io.index.configs.v1=/configs
9+
10+
# Copy declarative config root into image at /configs and pre-populate serve cache
11+
COPY /configs /configs
12+
RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"]
13+
14+
# Configure the entrypoint and command
15+
ENTRYPOINT ["/bin/opm"]
16+
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]

‎test/images/busybox-index/indexv1/configs/.indexignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/expected_all.json
2+
..*

‎test/images/busybox-index/indexv1/configs/catalog.json

+178
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
{
2+
"schema": "olm.package",
3+
"name": "busybox",
4+
"defaultChannel": "alpha"
5+
}
6+
{
7+
"schema": "olm.channel",
8+
"name": "alpha",
9+
"package": "busybox",
10+
"entries": [
11+
{
12+
"name": "busybox.v1.0.0"
13+
}
14+
]
15+
}
16+
{
17+
"schema": "olm.bundle",
18+
"name": "busybox.v1.0.0",
19+
"package": "busybox",
20+
"image": "quay.io/olmtest/busybox-bundle:1.0.0",
21+
"properties": [
22+
{
23+
"type": "olm.gvk.required",
24+
"value": {
25+
"group": "olm.test.io",
26+
"kind": "Foo",
27+
"version": "v1"
28+
}
29+
},
30+
{
31+
"type": "olm.package",
32+
"value": {
33+
"packageName": "busybox",
34+
"version": "1.0.0"
35+
}
36+
},
37+
{
38+
"type": "olm.csv.metadata",
39+
"value": {
40+
"apiServiceDefinitions": {},
41+
"crdDescriptions": {
42+
"required": [
43+
{
44+
"name": "foos.olm.test.io",
45+
"version": "v1",
46+
"kind": "Foo",
47+
"displayName": "Foo",
48+
"description": "Foo resources for testing dependencies"
49+
}
50+
]
51+
},
52+
"description": "A busybox CSV.\n",
53+
"displayName": "busybox",
54+
"installModes": [
55+
{
56+
"type": "OwnNamespace",
57+
"supported": true
58+
},
59+
{
60+
"type": "SingleNamespace",
61+
"supported": true
62+
},
63+
{
64+
"type": "MultiNamespace",
65+
"supported": true
66+
},
67+
{
68+
"type": "AllNamespaces",
69+
"supported": true
70+
}
71+
],
72+
"maturity": "alpha",
73+
"provider": {
74+
"name": "Red Hat"
75+
}
76+
}
77+
}
78+
],
79+
"relatedImages": [
80+
{
81+
"name": "",
82+
"image": "busybox"
83+
},
84+
{
85+
"name": "",
86+
"image": "quay.io/olmtest/busybox-bundle:1.0.0"
87+
}
88+
]
89+
}
90+
{
91+
"schema": "olm.package",
92+
"name": "busybox-dependency",
93+
"defaultChannel": "alpha"
94+
}
95+
{
96+
"schema": "olm.channel",
97+
"name": "alpha",
98+
"package": "busybox-dependency",
99+
"entries": [
100+
{
101+
"name": "busybox-dependency.v1.0.0"
102+
}
103+
]
104+
}
105+
{
106+
"schema": "olm.bundle",
107+
"name": "busybox-dependency.v1.0.0",
108+
"package": "busybox-dependency",
109+
"image": "quay.io/olmtest/busybox-dependency-bundle:1.0.0",
110+
"properties": [
111+
{
112+
"type": "olm.gvk",
113+
"value": {
114+
"group": "olm.test.io",
115+
"kind": "Foo",
116+
"version": "v1"
117+
}
118+
},
119+
{
120+
"type": "olm.package",
121+
"value": {
122+
"packageName": "busybox-dependency",
123+
"version": "1.0.0"
124+
}
125+
},
126+
{
127+
"type": "olm.csv.metadata",
128+
"value": {
129+
"apiServiceDefinitions": {},
130+
"crdDescriptions": {
131+
"owned": [
132+
{
133+
"name": "foos.olm.test.io",
134+
"version": "v1",
135+
"kind": "Foo",
136+
"displayName": "Foo",
137+
"description": "Foo resources for testing dependencies"
138+
}
139+
]
140+
},
141+
"description": "A busybox-dependency CSV.\n",
142+
"displayName": "busybox-dependency",
143+
"installModes": [
144+
{
145+
"type": "OwnNamespace",
146+
"supported": true
147+
},
148+
{
149+
"type": "SingleNamespace",
150+
"supported": true
151+
},
152+
{
153+
"type": "MultiNamespace",
154+
"supported": true
155+
},
156+
{
157+
"type": "AllNamespaces",
158+
"supported": true
159+
}
160+
],
161+
"maturity": "alpha",
162+
"provider": {
163+
"name": "Red Hat"
164+
}
165+
}
166+
}
167+
],
168+
"relatedImages": [
169+
{
170+
"name": "",
171+
"image": "busybox"
172+
},
173+
{
174+
"name": "",
175+
"image": "quay.io/olmtest/busybox-dependency-bundle:1.0.0"
176+
}
177+
]
178+
}

‎test/images/busybox-index/indexv2/configs/.indexignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/expected_all.json
2+
..*

‎test/images/busybox-index/indexv2/configs/catalog.json

+186
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
{
2+
"schema": "olm.package",
3+
"name": "busybox",
4+
"defaultChannel": "alpha"
5+
}
6+
{
7+
"schema": "olm.channel",
8+
"name": "alpha",
9+
"package": "busybox",
10+
"entries": [
11+
{
12+
"name": "busybox.v2.0.0",
13+
"skipRange": ">=0.0.0 <2.0.0"
14+
}
15+
]
16+
}
17+
{
18+
"schema": "olm.bundle",
19+
"name": "busybox.v2.0.0",
20+
"package": "busybox",
21+
"image": "quay.io/olmtest/busybox-bundle:2.0.0",
22+
"properties": [
23+
{
24+
"type": "olm.gvk.required",
25+
"value": {
26+
"group": "olm.test.io",
27+
"kind": "Foo",
28+
"version": "v1"
29+
}
30+
},
31+
{
32+
"type": "olm.package",
33+
"value": {
34+
"packageName": "busybox",
35+
"version": "2.0.0"
36+
}
37+
},
38+
{
39+
"type": "olm.csv.metadata",
40+
"value": {
41+
"annotations": {
42+
"olm.skipRange": ">=0.0.0 <2.0.0"
43+
},
44+
"apiServiceDefinitions": {},
45+
"crdDescriptions": {
46+
"required": [
47+
{
48+
"name": "foos.olm.test.io",
49+
"version": "v1",
50+
"kind": "Foo",
51+
"displayName": "Foo",
52+
"description": "Foo resources for testing dependencies"
53+
}
54+
]
55+
},
56+
"description": "A busybox CSV.\n",
57+
"displayName": "busybox",
58+
"installModes": [
59+
{
60+
"type": "OwnNamespace",
61+
"supported": true
62+
},
63+
{
64+
"type": "SingleNamespace",
65+
"supported": true
66+
},
67+
{
68+
"type": "MultiNamespace",
69+
"supported": true
70+
},
71+
{
72+
"type": "AllNamespaces",
73+
"supported": true
74+
}
75+
],
76+
"maturity": "alpha",
77+
"provider": {
78+
"name": "Red Hat"
79+
}
80+
}
81+
}
82+
],
83+
"relatedImages": [
84+
{
85+
"name": "",
86+
"image": "busybox"
87+
},
88+
{
89+
"name": "",
90+
"image": "quay.io/olmtest/busybox-bundle:2.0.0"
91+
}
92+
]
93+
}
94+
{
95+
"schema": "olm.package",
96+
"name": "busybox-dependency",
97+
"defaultChannel": "alpha"
98+
}
99+
{
100+
"schema": "olm.channel",
101+
"name": "alpha",
102+
"package": "busybox-dependency",
103+
"entries": [
104+
{
105+
"name": "busybox-dependency.v2.0.0",
106+
"skipRange": ">=0.0.0 <2.0.0"
107+
}
108+
]
109+
}
110+
{
111+
"schema": "olm.bundle",
112+
"name": "busybox-dependency.v2.0.0",
113+
"package": "busybox-dependency",
114+
"image": "quay.io/olmtest/busybox-dependency-bundle:2.0.0",
115+
"properties": [
116+
{
117+
"type": "olm.gvk",
118+
"value": {
119+
"group": "olm.test.io",
120+
"kind": "Foo",
121+
"version": "v1"
122+
}
123+
},
124+
{
125+
"type": "olm.package",
126+
"value": {
127+
"packageName": "busybox-dependency",
128+
"version": "2.0.0"
129+
}
130+
},
131+
{
132+
"type": "olm.csv.metadata",
133+
"value": {
134+
"annotations": {
135+
"olm.skipRange": ">=0.0.0 <2.0.0"
136+
},
137+
"apiServiceDefinitions": {},
138+
"crdDescriptions": {
139+
"owned": [
140+
{
141+
"name": "foos.olm.test.io",
142+
"version": "v1",
143+
"kind": "Foo",
144+
"displayName": "Foo",
145+
"description": "Foo resources for testing dependencies"
146+
}
147+
]
148+
},
149+
"description": "A busybox-dependency CSV.\n",
150+
"displayName": "busybox-dependency",
151+
"installModes": [
152+
{
153+
"type": "OwnNamespace",
154+
"supported": true
155+
},
156+
{
157+
"type": "SingleNamespace",
158+
"supported": true
159+
},
160+
{
161+
"type": "MultiNamespace",
162+
"supported": true
163+
},
164+
{
165+
"type": "AllNamespaces",
166+
"supported": true
167+
}
168+
],
169+
"maturity": "alpha",
170+
"provider": {
171+
"name": "Red Hat"
172+
}
173+
}
174+
}
175+
],
176+
"relatedImages": [
177+
{
178+
"name": "",
179+
"image": "busybox"
180+
},
181+
{
182+
"name": "",
183+
"image": "quay.io/olmtest/busybox-dependency-bundle:2.0.0"
184+
}
185+
]
186+
}

0 commit comments

Comments
 (0)