From 6e93675d73a5e66ef9b4cdd4f91745c22afa7ccb Mon Sep 17 00:00:00 2001 From: subhtk Date: Fri, 31 Jan 2025 19:41:12 +0530 Subject: [PATCH] Removed bundles feature from the oc-mirror v2 doc --- ...-mirror-imageset-config-parameters-v2.adoc | 42 ------------------- .../oc-mirror-operator-catalog-filtering.adoc | 21 +--------- modules/oc-mirror-v2-about.adoc | 3 -- 3 files changed, 2 insertions(+), 64 deletions(-) diff --git a/modules/oc-mirror-imageset-config-parameters-v2.adoc b/modules/oc-mirror-imageset-config-parameters-v2.adoc index b581f041027e..4e8b77340452 100644 --- a/modules/oc-mirror-imageset-config-parameters-v2.adoc +++ b/modules/oc-mirror-imageset-config-parameters-v2.adoc @@ -213,26 +213,6 @@ Example: `5.2.3-31` |String Example: `5.2.3-31` -|`mirror.operators.packages.bundles` -|Selected bundles configuration -|Array of objects - -Example: -[source,yaml,subs="attributes+"] ----- -operators: - - catalog: registry.redhat.io/redhat/redhat-operator-index:{product-version} - packages: - - name: 3scale-operator - bundles: - - name: 3scale-operator.v0.10.0-mas ----- - -|`mirror.operators.packages.bundles.name` -|Name of the bundle selected for mirror (as it appears in the catalog). -|String -Example : `3scale-operator.v0.10.0-mas` - |`mirror.operators.targetCatalog` |An alternative name and optional namespace hierarchy to mirror the referenced catalog as |String @@ -438,28 +418,6 @@ Example: `5.2.3-31` |String Example: `5.2.3-31` -|`delete.operators.packages.bundles` -|The selected bundles configuration -|Array of objects - -You cannot choose both channels and bundles for the same operator. - -Example: -[source,yaml] ----- -operators: - - catalog: registry.redhat.io/redhat/redhat-operator-index:{product-version} - packages: - - name: 3scale-operator - bundles: - - name: 3scale-operator.v0.10.0-mas ----- - -|`delete.operators.packages.bundles.name` -|Name of the bundle selected to delete (as it is displayed in the catalog) -|String -Example : `3scale-operator.v0.10.0-mas` - |`delete.platform` |The platform configuration of the image set |Object diff --git a/modules/oc-mirror-operator-catalog-filtering.adoc b/modules/oc-mirror-operator-catalog-filtering.adoc index 46d734131042..9b65333b621d 100644 --- a/modules/oc-mirror-operator-catalog-filtering.adoc +++ b/modules/oc-mirror-operator-catalog-filtering.adoc @@ -201,23 +201,6 @@ mirror: a|Scenario 14 -[source,yaml] ----- -mirror: - operators: - - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.14 - packages: - - name: aws-load-balancer-operator - bundles: - - name: aws-load-balancer-operator.v1.1.0 - - name: 3scale-operator - bundles: - - name: 3scale-operator.v0.10.0-mas ----- -|Only the bundles specified for each package are included in the filtering. - -a|Scenario 15 - [source,yaml] ---- mirror: @@ -232,7 +215,7 @@ mirror: ---- |Do not use this scenario. filtering by channel and by package with a `minVersion` or `maxVersion` is not allowed. -a|Scenario 16 +a|Scenario 15 [source,yaml] ---- @@ -248,7 +231,7 @@ mirror: ---- |Do not use this scenario. You cannot filter using `full:true` and the `minVersion` or `maxVersion`. -a|Scenario 17 +a|Scenario 16 [source,yaml] ---- diff --git a/modules/oc-mirror-v2-about.adoc b/modules/oc-mirror-v2-about.adoc index ff07113a0d3c..46e46dfb5ebf 100644 --- a/modules/oc-mirror-v2-about.adoc +++ b/modules/oc-mirror-v2-about.adoc @@ -27,9 +27,6 @@ oc-mirror plugin v2 has the following features: * Can generate `ImageDigestMirrorSet` (IDMS) and `ImageTagMirrorSet` (ITMS) resources, which cover the full image set, instead of an `ImageContentSourcePolicy` (ICSP) resource, which only covered incremental changes to the image set for each mirroring operation with v1. -* Saves Operator versions that are filtered by bundle name. -// Can anyone elaborate what this means? I am mostly confused with what the word "filter" means here. - * Does not perform automatic pruning. v2 now uses a `Delete` feature, which grants users more control over deleting images. * Introduces support for `registries.conf` files. This change facilitates mirroring to multiple enclaves while using the same cache.