Skip to content

Commit ad729a5

Browse files
committed
Updated Operator catalog for oc-mirror
1 parent 2d14bd8 commit ad729a5

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

modules/oc-mirror-operator-catalog-filtering.adoc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ oc-mirror plugin v2 selects the list of bundles for mirroring by processing the
1010

1111
When oc-mirror plugin v2 selects bundles for mirroring, it does not infer Group Version Kind (GVK) or bundle dependencies, omitting them from the mirroring set. Instead, it strictly adheres to the user instructions. You must explicitly specify any required dependent packages and their versions.
1212

13-
Bundle versions typically use semantic versioning standards (SemVer), and you can sort bundles within a channel by version. You can select buncles that fall within a specific range in the `ImageSetConfig`.
14-
15-
This selection algorithm ensures consistent outcomes compared to oc-mirror plugin v1. However, it does not include upgrade graph details, such as `replaces`, `skip`, and `skipRange`. This approach differs from the OLM algorithm. It might mirror more bundles than necessary for upgrading a cluster because of potentially shorter upgrade paths between the `minVersion` and `maxVersion`.
16-
1713
.Use the following table to see what bundle versions are included in different scenarios
1814
[cols="1,2",options="header"]
1915

@@ -31,7 +27,7 @@ mirror:
3127
operators:
3228
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.10
3329
----
34-
|For each package in the catalog, 1 bundle, corresponding to the head version of the default channel for that package.
30+
|For each package in the catalog, one bundle, corresponding to the head version for each channel of that package.
3531

3632
a|Scenario 2
3733

@@ -42,7 +38,7 @@ mirror:
4238
- catalog: registry.redhat.io/redhat/redhat-operator-index:v4.10
4339
full: true
4440
----
45-
|All bundles of all channels of the specified catalog
41+
|All bundles of all channels of the specified catalog.
4642

4743
a|Scenario 3
4844

@@ -54,7 +50,7 @@ mirror:
5450
packages:
5551
- name: compliance-operator
5652
----
57-
|One bundle, corresponding to the head version of the default channel for that package
53+
|One bundle, corresponding to the head version for each channel of that package.
5854

5955
a|Scenario 4
6056

@@ -67,7 +63,7 @@ mirror:
6763
- packages:
6864
- name: elasticsearch-operator
6965
----
70-
|All bundles of all channels for the packages specified
66+
|All bundles of all channels for the packages specified.
7167

7268
a|Scenario 5
7369

@@ -80,7 +76,7 @@ mirror:
8076
- name: compliance-operator
8177
minVersion: 5.6.0
8278
----
83-
|All bundles in the default channel, from the `minVersion`, up to the channel head for that package that do not rely on the shortest path from upgrade the graph.
79+
|All bundles in all channels, from the `minVersion`, up to the channel head for that package.
8480

8581
a|Scenario 6
8682

@@ -93,7 +89,7 @@ mirror:
9389
- name: compliance-operator
9490
maxVersion: 6.0.0
9591
----
96-
|All bundles in the default channel that are lower than the `maxVersion` for that package.
92+
|All bundles in all channels that are lower than the `maxVersion` for that package.
9793

9894
a|Scenario 7
9995

@@ -107,7 +103,7 @@ mirror:
107103
minVersion: 5.6.0
108104
maxVersion: 6.0.0
109105
----
110-
|All bundles in the default channel, between the `minVersion` and `maxVersion` for that package. The head of the channel is not included, even if multiple channels are included in the filtering.
106+
|All bundles in all channels, between the `minVersion` and `maxVersion` for that package. The head of the channel is not included, even if multiple channels are included in the filtering.
111107

112108
a|Scenario 8
113109

@@ -121,7 +117,7 @@ mirror:
121117
channels
122118
- name: stable
123119
----
124-
|The head bundle for the selected channel of that package.
120+
|The head bundle for the selected channel of that package. You must use the `defaultChannel` field in case the filtered channels are not the default.
125121

126122
a|Scenario 9
127123

@@ -136,7 +132,8 @@ mirror:
136132
channels:
137133
- name: 'stable-v0'
138134
----
139-
|All bundles for the specified packages and channels.
135+
|All bundles for the packages and channels specified.
136+
The `defaultChannel` should be used in case the filtered channels are not the default.
140137

141138
a|Scenario 10
142139

@@ -166,7 +163,7 @@ mirror:
166163
- name: stable
167164
minVersion: 5.6.0
168165
----
169-
|Within the selected channel of that package, all versions starting with the `minVersion` up to the channel head. This scenario does not relyon the shortest path from the upgrade graph.
166+
|Within the selected channel of that package, all versions starting with the `minVersion` up to the channel head. You must use the `defaultChannel` field in case the filtered channels are not the default.
170167

171168
a|Scenario 12
172169

@@ -181,7 +178,9 @@ mirror:
181178
- name: stable
182179
maxVersion: 6.0.0
183180
----
184-
|Within the selected channel of that package, all versions up to the `maxVersion` (not relying on the shortest path from the upgrade graph). The head of the channel is not included, even if multiple channels are included in the filtering.
181+
|Within the selected channel of that package, all versions up to `maxVersion`.
182+
Head of channel is not included, even if multiple channels are included in the filtering.
183+
You might see errors if this filtering leads to a channel with multiple heads. You must use the `defaultChannel` field in case the filtered channels are not the default.
185184

186185
a|Scenario 13
187186

@@ -197,7 +196,8 @@ mirror:
197196
minVersion: 5.6.0
198197
maxVersion: 6.0.0
199198
----
200-
|Within the selected channel of that package, all versions between the `minVersion` and `maxVersion`, not relying on the shortest path from the upgrade graph. The head of the channel is not included, even if multiple channels are included in the filtering.
199+
|Within the selected channel of that package, all versions between the `minVersion` and `maxVersion`. The head of channel is not included, even if multiple channels are included in the filtering.
200+
You might see errors if this filtering leads to a channel with multiple heads. You must use the `defaultChannel` field in case the filtered channels are not the default.
201201

202202
a|Scenario 14
203203

0 commit comments

Comments
 (0)