Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-31092: Fix archive tar file size to respect the archiveSize s… #842

Merged
merged 1 commit into from Apr 30, 2024

Conversation

sherine-k
Copy link
Contributor

Description

Fix archive tar file size to respect the archiveSize setting when mirror with V2 format

Fixes # OCPBUGS-31092

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

How Has This Been Tested?

Mirror to disk with the following ISC should pass

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
archiveSize: 8
mirror:
  # platform:
  #   channels:
  #   - name: stable-4.13
  #   graph: true
  operators:
  - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.15
    packages:
    - name: advanced-cluster-management                                  
      channels:
      - name: release-2.9             
    - name: compliance-operator
      channels:
      - name: stable
    - name: multicluster-engine
      channels:
      - name: stable-2.4
      - name: stable-2.5
  additionalImages:
  - name: registry.redhat.io/ubi8/ubi:latest                        
  - name: registry.redhat.io/rhel8/support-tools:latest
  - name: registry.access.redhat.com/ubi8/nginx-120:latest
  - name: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
  - name: registry.k8s.io/sig-storage/csi-resizer:v1.8.0

Expected Outcome

$ ls -lh  ~/clid20/
total 12G
-rw-r--r--. 1 skhoury skhoury 7.9G Apr 29 15:57 mirror_000001.tar
-rw-r--r--. 1 skhoury skhoury 3.8G Apr 29 15:57 mirror_000002.tar
drwxr-xr-x. 1 skhoury skhoury  262 Apr 29 15:50 working-dir

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 29, 2024
@openshift-ci-robot
Copy link

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

  • expected the bug to target the "4.16.0" version, but no target version was set

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:

Description

Fix archive tar file size to respect the archiveSize setting when mirror with V2 format

Fixes # OCPBUGS-31092

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

How Has This Been Tested?

Mirror to disk with the following ISC should pass

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
archiveSize: 8
mirror:
 # platform:
 #   channels:
 #   - name: stable-4.13
 #   graph: true
 operators:
 - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.15
   packages:
   - name: advanced-cluster-management                                  
     channels:
     - name: release-2.9             
   - name: compliance-operator
     channels:
     - name: stable
   - name: multicluster-engine
     channels:
     - name: stable-2.4
     - name: stable-2.5
 additionalImages:
 - name: registry.redhat.io/ubi8/ubi:latest                        
 - name: registry.redhat.io/rhel8/support-tools:latest
 - name: registry.access.redhat.com/ubi8/nginx-120:latest
 - name: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
 - name: registry.k8s.io/sig-storage/csi-resizer:v1.8.0

Expected Outcome

$ ls -lh  ~/clid20/
total 12G
-rw-r--r--. 1 skhoury skhoury 7.9G Apr 29 15:57 mirror_000001.tar
-rw-r--r--. 1 skhoury skhoury 3.8G Apr 29 15:57 mirror_000002.tar
drwxr-xr-x. 1 skhoury skhoury  262 Apr 29 15:50 working-dir

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 openshift-eng/jira-lifecycle-plugin repository.

@sherine-k
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Apr 29, 2024
@openshift-ci-robot
Copy link

@sherine-k: This pull request references Jira Issue OCPBUGS-31092, 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:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 29, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 29, 2024
Copy link
Contributor

@aguidirh aguidirh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @sherine-k,

I tested locally and everything is working fine.

@aguidirh
Copy link
Contributor

/lgtm

Copy link

openshift-ci bot commented Apr 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aguidirh, 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:

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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2024
Copy link

openshift-ci bot commented Apr 30, 2024

@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.

@openshift-merge-bot openshift-merge-bot bot merged commit d0c3c47 into openshift:main Apr 30, 2024
5 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

Description

Fix archive tar file size to respect the archiveSize setting when mirror with V2 format

Fixes # OCPBUGS-31092

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

How Has This Been Tested?

Mirror to disk with the following ISC should pass

kind: ImageSetConfiguration
apiVersion: mirror.openshift.io/v2alpha1
archiveSize: 8
mirror:
 # platform:
 #   channels:
 #   - name: stable-4.13
 #   graph: true
 operators:
 - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.15
   packages:
   - name: advanced-cluster-management                                  
     channels:
     - name: release-2.9             
   - name: compliance-operator
     channels:
     - name: stable
   - name: multicluster-engine
     channels:
     - name: stable-2.4
     - name: stable-2.5
 additionalImages:
 - name: registry.redhat.io/ubi8/ubi:latest                        
 - name: registry.redhat.io/rhel8/support-tools:latest
 - name: registry.access.redhat.com/ubi8/nginx-120:latest
 - name: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
 - name: registry.k8s.io/sig-storage/csi-resizer:v1.8.0

Expected Outcome

$ ls -lh  ~/clid20/
total 12G
-rw-r--r--. 1 skhoury skhoury 7.9G Apr 29 15:57 mirror_000001.tar
-rw-r--r--. 1 skhoury skhoury 3.8G Apr 29 15:57 mirror_000002.tar
drwxr-xr-x. 1 skhoury skhoury  262 Apr 29 15:50 working-dir

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 openshift-eng/jira-lifecycle-plugin repository.

@sherine-k
Copy link
Contributor Author

/reopen

Copy link

openshift-ci bot commented Apr 30, 2024

@sherine-k: Failed to re-open PR: state cannot be changed. The pull request cannot be reopened.

In response to this:

/reopen

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build oc-mirror-plugin-container-v4.17.0-202404301246.p0.gd0c3c47.assembly.stream.el9 for distgit oc-mirror-plugin.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.16.0-0.nightly-2024-05-01-111315

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants