openshift / oc-mirror

Lifecycle manager for internet-disconnected OpenShift environments
Apache License 2.0
88 stars 80 forks source link

OCPBUGS-31608:OCPBUGS-33775: Fix source repository for IDMS/ITMS in case of empty namespace #850

Closed sherine-k closed 4 months ago

sherine-k commented 4 months ago

Description

Fix source repository for IDMS/ITMS in case of empty namespace

This also clears the cluster-resources folder while setting up the working-dir, so that old itms , catalogsrouce files don't stay stale in the folder, and get dragged into the tar file.

It also fixes dry-run for mirror-to-disk mode which was checking and not finding any of the images in the cache due to the fact that it was using a srcImage context (tls enabled) instead of the destImage context (tls disabled for the cache registry)

Fixes # OCPBUGS-31608

Type of change

Please delete options that are not relevant.

How Has This Been Tested?

Using the following imageSetConfig, perform a mirror to disk followed by disk to mirror as stated in the jira issue:

apiVersion: mirror.openshift.io/v2alpha1
kind: ImageSetConfiguration
mirror:
  operators:
    - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.15
      packages:
        - name: devworkspace-operator
          minVersion: "0.23.0"
        - name: quay-operator
          maxVersion: "3.10.2"
        - name: cluster-logging
          minVersion: 5.8.3
          maxVersion: 5.8.5

Expected Outcome

the working-dir/cluster-resources folder should contain 2 files only

The idms-oc-mirror.yaml file should contain the following imageDigestMirrors:

  imageDigestMirrors:
  - mirrors:
    - localhost:5000/31608/devworkspace
    source: registry.redhat.io/devworkspace
  - mirrors:
    - localhost:5000/31608/openshift4
    source: registry.redhat.io/openshift4
  - mirrors:
    - localhost:5000/31608
    source: registry.redhat.io

The last source should be registry.redhat.io, and not registry.redhat.io**/**

openshift-ci-robot commented 4 months ago

@sherine-k: This pull request references Jira Issue OCPBUGS-31608, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/oc-mirror/pull/850): ># Description > > Fix source repository for IDMS/ITMS in case of empty namespace > >This also clears the cluster-resources folder while setting up the working-dir, so that old itms , catalogsrouce files don't stay stale in the folder, and get dragged into the tar file. > >It also fixes dry-run for mirror-to-disk mode which was checking and not finding any of the images in the cache due to the fact that it was using a srcImage context (tls enabled) instead of the destImage context (tls disabled for the cache registry) > >Fixes # (issue) > >## Type of change > >Please delete options that are not relevant. > >- [x] 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 > ># How Has This Been Tested? >Using the following imageSetConfig, perform a mirror to disk followed by disk to mirror as stated in the jira issue: >```yaml >apiVersion: mirror.openshift.io/v2alpha1 >kind: ImageSetConfiguration >mirror: > operators: > - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.15 > packages: > - name: devworkspace-operator > minVersion: "0.23.0" > - name: quay-operator > maxVersion: "3.10.2" > - name: cluster-logging > minVersion: 5.8.3 > maxVersion: 5.8.5 >``` > >## Expected Outcome >the working-dir/cluster-resources folder should contain 2 files only >* cs-redhat-operator-index-v4-15.yaml >* idms-oc-mirror.yaml > >The idms-oc-mirror.yaml file should contain the following imageDigestMirrors: >```yaml > imageDigestMirrors: > - mirrors: > - localhost:5000/31608/devworkspace > source: registry.redhat.io/devworkspace > - mirrors: > - localhost:5000/31608/openshift4 > source: registry.redhat.io/openshift4 > - mirrors: > - localhost:5000/31608 > source: registry.redhat.io > >``` > >The last `source` should be `registry.redhat.io`, and not `registry.redhat.io**/**` > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Foc-mirror). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci[bot] commented 4 months ago

[APPROVALNOTIFIER] This PR is APPROVED

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

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](https://github.com/openshift/oc-mirror/blob/main/OWNERS)~~ [sherine-k] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci-robot commented 4 months ago

@sherine-k: This pull request references Jira Issue OCPBUGS-31608, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.0) matches configured target version for branch (4.16.0) * bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @zhouying7780

In response to [this](https://github.com/openshift/oc-mirror/pull/850): ># Description > > Fix source repository for IDMS/ITMS in case of empty namespace > >This also clears the cluster-resources folder while setting up the working-dir, so that old itms , catalogsrouce files don't stay stale in the folder, and get dragged into the tar file. > >It also fixes dry-run for mirror-to-disk mode which was checking and not finding any of the images in the cache due to the fact that it was using a srcImage context (tls enabled) instead of the destImage context (tls disabled for the cache registry) > >Fixes # OCPBUGS-31608 > >## Type of change > >Please delete options that are not relevant. > >- [x] 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 > ># How Has This Been Tested? >Using the following imageSetConfig, perform a mirror to disk followed by disk to mirror as stated in the jira issue: >```yaml >apiVersion: mirror.openshift.io/v2alpha1 >kind: ImageSetConfiguration >mirror: > operators: > - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.15 > packages: > - name: devworkspace-operator > minVersion: "0.23.0" > - name: quay-operator > maxVersion: "3.10.2" > - name: cluster-logging > minVersion: 5.8.3 > maxVersion: 5.8.5 >``` > >## Expected Outcome >the working-dir/cluster-resources folder should contain 2 files only >* cs-redhat-operator-index-v4-15.yaml >* idms-oc-mirror.yaml > >The idms-oc-mirror.yaml file should contain the following imageDigestMirrors: >```yaml > imageDigestMirrors: > - mirrors: > - localhost:5000/31608/devworkspace > source: registry.redhat.io/devworkspace > - mirrors: > - localhost:5000/31608/openshift4 > source: registry.redhat.io/openshift4 > - mirrors: > - localhost:5000/31608 > source: registry.redhat.io > >``` > >The last `source` should be `registry.redhat.io`, and not `registry.redhat.io**/**` > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Foc-mirror). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
sherine-k commented 4 months ago

/jira refresh

openshift-ci-robot commented 4 months ago

@sherine-k: This pull request references Jira Issue OCPBUGS-31608, which is valid.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.0) matches configured target version for branch (4.16.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @zhouying7780

In response to [this](https://github.com/openshift/oc-mirror/pull/850#issuecomment-2109537994): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Foc-mirror). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
zhouying7780 commented 4 months ago

/label qe-approved

sherine-k commented 4 months ago

/jira refresh

openshift-ci-robot commented 4 months ago

@sherine-k: This pull request references Jira Issue OCPBUGS-31608, which is valid.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.0) matches configured target version for branch (4.16.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @zhouying7780

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/oc-mirror/pull/850#issuecomment-2115193408): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Foc-mirror). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
lmzuccarelli commented 4 months ago

/lgtm /label acknowledge-critical-fixes-only

openshift-ci[bot] commented 4 months ago

@sherine-k: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-ci-robot commented 4 months ago

@sherine-k: Jira Issue OCPBUGS-31608: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-31608 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/oc-mirror/pull/850): ># Description > > Fix source repository for IDMS/ITMS in case of empty namespace > >This also clears the cluster-resources folder while setting up the working-dir, so that old itms , catalogsrouce files don't stay stale in the folder, and get dragged into the tar file. > >It also fixes dry-run for mirror-to-disk mode which was checking and not finding any of the images in the cache due to the fact that it was using a srcImage context (tls enabled) instead of the destImage context (tls disabled for the cache registry) > >Fixes # OCPBUGS-31608 > >## Type of change > >Please delete options that are not relevant. > >- [x] 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 > ># How Has This Been Tested? >Using the following imageSetConfig, perform a mirror to disk followed by disk to mirror as stated in the jira issue: >```yaml >apiVersion: mirror.openshift.io/v2alpha1 >kind: ImageSetConfiguration >mirror: > operators: > - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.15 > packages: > - name: devworkspace-operator > minVersion: "0.23.0" > - name: quay-operator > maxVersion: "3.10.2" > - name: cluster-logging > minVersion: 5.8.3 > maxVersion: 5.8.5 >``` > >## Expected Outcome >the working-dir/cluster-resources folder should contain 2 files only >* cs-redhat-operator-index-v4-15.yaml >* idms-oc-mirror.yaml > >The idms-oc-mirror.yaml file should contain the following imageDigestMirrors: >```yaml > imageDigestMirrors: > - mirrors: > - localhost:5000/31608/devworkspace > source: registry.redhat.io/devworkspace > - mirrors: > - localhost:5000/31608/openshift4 > source: registry.redhat.io/openshift4 > - mirrors: > - localhost:5000/31608 > source: registry.redhat.io > >``` > >The last `source` should be `registry.redhat.io`, and not `registry.redhat.io**/**` > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Foc-mirror). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-merge-robot commented 4 months ago

Fix included in accepted release 4.16.0-0.nightly-2024-05-17-180525