CFE-764 : Introduce v1alpha2.Operator.TargetCatalog

[sherine-k]

TargetCatalog can contain several component-paths, allowing the user to set the namespace to which the catalog will be copied.

It will later replace TargetName.

Changes to be committed:
modified: pkg/api/v1alpha2/types_config.go
new file: pkg/api/v1alpha2/types_config_test.go
modified: pkg/cli/mirror/fbc_operators.go
modified: pkg/cli/mirror/fbc_operators_test.go
modified: pkg/cli/mirror/manifests.go

Description

See https://issues.redhat.com/browse/CFE-764?filter=-1 for relevant motivation and context.

Fixes # CFE-764

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

Changes in GetUniqueName and ICSP generation (determining namespace scope of mirrored images) have been changed for catalogs. This might have impacts on the way images are mirrored or contents of ICSP.

How Has This Been Tested?

• Simple flow - cmd1, IMSTCFG=imstcfg1.yaml
• Simple flow with namespace - cmd2, IMSTCFG=imstcfg1.yaml
• Simple flow with TargetCatalog - cmd1, IMSTCFG=imstcfg2.yaml
• OCI FBC flow - cmd1, IMSTCFG=imstcfg3.yaml
• OCI FBC flow with namespace - cmd2, IMSTCFG=imstcfg3.yaml

PS: /tmp/storageBackend was cleaned after each test. Otherwise, an issue was found reading the metadata. This didn't seem related to the PR, and we think will be fixed with #564

Test Configuration:

• command lines

Name	Command
cmd1	./bin/oc-mirror -c $IMSTCFG docker://localhost:5000 --dest-skip-tls --dest-use-http --use-oci-feature
cmd2	./bin/oc-mirror -c $IMSTCFG docker://localhost:5000/test-namespace --dest-skip-tls --dest-use-http --use-oci-feature

• imstcfg1.yaml:

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v1alpha2
storageConfig:
  local:
    path: /tmp/storageBackend
mirror:
  operators:
  - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.12
    packages:
    - name: aws-load-balancer-operator

• imstcfg2.yaml:

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v1alpha2
storageConfig:
  local:
    path: /tmp/storageBackend
mirror:
  operators:
  - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.12
    targetCatalog: abc/redhat-operator-index
    packages:
    - name: aws-load-balancer-operator

• imstcfg3.yaml:

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v1alpha2
storageConfig:
  local:
    path: /tmp/storageBackend
mirror:
  operators:
  - catalog: oci:///home/skhoury/oci-catalog2
    targetCatalog: mno/redhat-operator-index
    targetTag: v4.12
     packages:
    - name: aws-load-balancer-operator

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

[zhouying7780]

pre-merge test done, no issue found

[zhouying7780]

/label qe-approved

[sherine-k]

/assign @jchunkins
/assign @lmzuccarelli

[lmzuccarelli]

/lgtm

[soltysh]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sherine-k, soltysh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [soltysh]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@sherine-k: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

• /test e2e
• /test images
• /test sanity
• /test unit

The following commands are available to trigger optional jobs:

• /test integration

Use /test all to run the following jobs that were automatically triggered:

• pull-ci-openshift-oc-mirror-main-e2e
• pull-ci-openshift-oc-mirror-main-images
• pull-ci-openshift-oc-mirror-main-sanity
• pull-ci-openshift-oc-mirror-main-unit

In response to this:

/test ci/prow/images

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[sherine-k]

/test images

[openshift-ci]

@sherine-k: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[lmzuccarelli]

/lgtm