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

Bug 2089918: adds fix for --skip-missing flag processing #484

Merged
merged 7 commits into from
Jun 10, 2022

Conversation

jpower432
Copy link
Contributor

@jpower432 jpower432 commented Jun 2, 2022

Description

This PR updates the oc import to get the fix for skip missing in oc image mirror to address images with digest.

To maintain compatibility between imports the following two imports were updated:
Operator Registry 1.22.1 => 1.23.0
Helm 3.7.2 => 3.8.1

Due to a compatibility issue with the version of containerd in Helm versions greater than 3.8.1 and k8s.io/component-base/traces v0.24.0, the render method in helm.go needed to be refactored to remove the Helm action package.

Fixes #476

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • This change requires a documentation update

How Has This Been Tested?

  • Tested rendering different charts with new render logic
  • Tested skip missing

How to Test

  • Test Helm changes (Uses chart with and without verification)
kind: ImageSetConfiguration
mirror:
  helm:
    repositories:
      - name: bitnami
        url: https://charts.bitnami.com/bitnami
        charts:
          - name: apache
          - name: redis
      - name: podinfo
        url: https://stefanprodan.github.io/podinfo
        charts:
          - name: podinfo
            version: 5.0.0
  • Test Skip Missing (Try to pull a ubi image with a non-existent digest)
apiVersion: mirror.openshift.io/v1alpha2
kind: ImageSetConfiguration
storageConfig:
  local:
    path: metadata
mirror:
  additionalimages:
    - name: registry.redhat.io/ubi8/ubi:latest
    - name: registry.redhat.io/ubi8/ubi@sha256:fc07c1e2a5f012320ae672ca8546ff0d09eb8dba3c5acbbfc426c7984169ee84

Run
oc-mirror --config imageset-config.yaml file://out

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

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jun 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jpower432

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

@jpower432 jpower432 changed the title [WIP] Adds fix for --skip-missing flag processing [WIP] Bug 2089918 : adds fix for --skip-missing flag processing Jun 2, 2022
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 2, 2022
@jpower432 jpower432 changed the title [WIP] Bug 2089918 : adds fix for --skip-missing flag processing [WIP] Bug 2089918: adds fix for --skip-missing flag processing Jun 3, 2022
@openshift-ci openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 3, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jun 3, 2022

@jpower432: This pull request references Bugzilla bug 2089918, which is invalid:

  • expected the bug to target the "4.11.0" release, but it targets "---" instead

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

In response to this:

[WIP] Bug 2089918: adds fix for --skip-missing flag processing

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.

@dinhxuanvu
Copy link
Member

/bugzilla refresh

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 3, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jun 3, 2022

@dinhxuanvu: This pull request references Bugzilla bug 2089918, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

/bugzilla 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 kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested a review from zhouying7780 June 3, 2022 12:55
@dinhxuanvu
Copy link
Member

/bugzilla refresh

@openshift-ci
Copy link

openshift-ci bot commented Jun 3, 2022

@dinhxuanvu: This pull request references Bugzilla bug 2089918, which is valid.

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

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

/bugzilla 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 kubernetes/test-infra repository.

@openshift-ci
Copy link

openshift-ci bot commented Jun 3, 2022

@jpower432: This pull request references Bugzilla bug 2089918, which is valid.

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

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

[WIP] Bug 2089918: adds fix for --skip-missing flag processing

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.

1 similar comment
@openshift-ci
Copy link

openshift-ci bot commented Jun 3, 2022

@jpower432: This pull request references Bugzilla bug 2089918, which is valid.

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

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

[WIP] Bug 2089918: adds fix for --skip-missing flag processing

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.

@jpower432 jpower432 changed the title [WIP] Bug 2089918: adds fix for --skip-missing flag processing Bug 2089918: adds fix for --skip-missing flag processing Jun 3, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 3, 2022
@jpower432 jpower432 changed the title Bug 2089918: adds fix for --skip-missing flag processing [WIP] Bug 2089918: adds fix for --skip-missing flag processing Jun 6, 2022
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 6, 2022
@jpower432 jpower432 changed the title [WIP] Bug 2089918: adds fix for --skip-missing flag processing Bug 2089918: adds fix for --skip-missing flag processing Jun 6, 2022
@openshift-ci openshift-ci bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 6, 2022
@openshift-ci openshift-ci bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 7, 2022
bumps oc import version to commit d91e0087a8a6120cbbea65397d25267a8de1cf42

bumps operator-registry import to v1.23.0

bumos helm import version to v3.9.0

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
The version of containerd used in helm 3.9.0 is not
compatibile with version 0.24.0 of k8s/component-base.
To allow the upgrade of other components, the render method has
been refactored to removed the uneccessary import of kube packages from helm.

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
Fixes openshift#476

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
…helm.go

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 8, 2022
@jpower432
Copy link
Contributor Author

/test integration

@jpower432
Copy link
Contributor Author

/test integration

@openshift-ci
Copy link

openshift-ci bot commented Jun 9, 2022

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

Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2022
@openshift-merge-robot openshift-merge-robot merged commit ee9bdb5 into openshift:main Jun 10, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jun 10, 2022

@jpower432: All pull requests linked via external trackers have merged:

Bugzilla bug 2089918 has been moved to the MODIFIED state.

In response to this:

Bug 2089918: adds fix for --skip-missing flag processing

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.

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

oc-mirror skip-missing still returns a 404 error
4 participants