Skip to content

Conversation

@ktania46
Copy link
Contributor

BZ : https://bugzilla.redhat.com/show_bug.cgi?id=1894382

This update is for 4.5 , 4.6 and 4.7 release

@SNiemann15 @vikram-redhat

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 18, 2021
@openshift-docs-preview-bot

The preview will be available shortly at:

@ktania46 ktania46 changed the title CRW Image Registry update for Z and Power Image Registry update for Z and Power Jan 18, 2021
@ghatwala
Copy link

Had confirmed using this flag - --binary-image or -i to prune the source index of all but the specified packages via steps given here - https://bugzilla.redhat.com/show_bug.cgi?id=1894382#c4

@ghatwala
Copy link

LGTM

@SNiemann15
Copy link
Contributor

@doris.xu Can you validate this on Z please?

-f {index-image-pullspec} \// <1>
-p {package1},{package2},{package3} \// <2>
-t <target_registry>:<port>/<namespace>/{index-image} <3>
-i registry.redhat.io/openshift4/ose-operator-registry/{index-image}

Choose a reason for hiding this comment

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

should there be a <4> on this line and an explanation below? Also if this is only needed for P & Z, what's the default -i value for amd64?

Copy link
Contributor

Choose a reason for hiding this comment

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

If that line isn't needed for other architectures I would suggest we remove the note and make it a callout.

<4> Use -i only with IBM Power Systems and IBM Z images.

Choose a reason for hiding this comment

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

The default value of base image is quay.io/operator-framework/upstream-opm-builder which isn't multi-arch and thus prune command - opm index prune fails on Power ( should fail on Z too , yet to be validated though) . To resolve this had to replace it with - registry.redhat.io/openshift4/ose-operator-registry which is multi-arch passed using flag -i to prune command .... fyi @SNiemann15 @nickboldt

Choose a reason for hiding this comment

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

So... leave it in with the default?

-i quay.io/operator-framework/upstream-opm-builder <4>

then below...

@ghatwala
Copy link

ghatwala commented Feb 2, 2021

FYI [email protected]

@netlify
Copy link

netlify bot commented Feb 10, 2021

Deploy preview for osdocs ready!

Built with commit ab707dd

https://deploy-preview-28642--osdocs.netlify.app

@tdaleibm
Copy link

/lgtm

@openshift-ci-robot
Copy link

@tdaleibm: changing LGTM is restricted to collaborators

Details

In response to this:

/lgtm

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.

@ghatwala
Copy link

/lgtm

@openshift-ci-robot
Copy link

@ghatwala: changing LGTM is restricted to collaborators

Details

In response to this:

/lgtm

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.

Copy link

@nickboldt nickboldt Feb 10, 2021

Choose a reason for hiding this comment

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

So then:

<4> For IBM Power Systems and IBM Z images, a different image must be used: -i registry.redhat.io/openshift4/ose-operator-registry/{index-image}

?

Choose a reason for hiding this comment

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

Will it be mentioned somewhere else what {index-image} to actuallly use? I believe we can explicitly say to use -i registry.redhat.io/openshift4/ose-operator-registry:v4.6 for both P and Z.

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
-i registry.redhat.io/openshift4/ose-operator-registry/{index-image}
-i registry.redhat.io/openshift4/ose-operator-registry/{index-image} <4>

Copy link
Contributor

Choose a reason for hiding this comment

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

@ktania46 Remember also to put a trailing \ at the end of previous lines when you're adding a new final line to these sort of multi-line commands. For example:

    -t <target_registry>:<port>/<namespace>/{index-image}  \// <3>
    -i registry.redhat.io/openshift4/ose-operator-registry/{index-image} <4>

(Note that \// is required when the line also includes a callout like <3>.)

I'm fixing this spot in another related PR, so just FYI for the future. Thank you for the PR! 🎉

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<4> Use `-i` only with IBM Power Systems and IBM Z images.
<4> Use the `-i` option with only IBM Power Systems and IBM Z images.

Is this option optional or required for IBM Z/Power? If it's optional, it's fine, but if a Z/Power needs to use this option, please clarify.

Choose a reason for hiding this comment

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

This is required for IBM Z/Power.

@vikram-redhat
Copy link
Contributor

vikram-redhat commented Feb 17, 2021

hold for merge till after 4.7 GA at which point it should be Cherrypicked to 4.8 branch as well.

@codyhoag codyhoag merged commit 384e4f5 into openshift:master Feb 25, 2021
@codyhoag
Copy link
Contributor

/cherrypick enterprise-4.8

@codyhoag
Copy link
Contributor

/cherrypick enterprise-4.7

@codyhoag
Copy link
Contributor

/cherrypick enterprise-4.6

@codyhoag
Copy link
Contributor

/cherrypick enterprise-4.5

@openshift-cherrypick-robot

@codyhoag: #28642 failed to apply on top of branch "enterprise-4.8":

Patch is empty.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.8

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-cherrypick-robot

@codyhoag: new pull request created: #29846

Details

In response to this:

/cherrypick enterprise-4.7

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-cherrypick-robot

@codyhoag: new pull request created: #29847

Details

In response to this:

/cherrypick enterprise-4.6

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-cherrypick-robot

@codyhoag: #28642 failed to apply on top of branch "enterprise-4.5":

Applying: CRW Image Registry update for Z and Power
Using index info to reconstruct a base tree...
A	modules/olm-pruning-index-image.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/olm-pruning-index-image.adoc deleted in HEAD and modified in CRW Image Registry update for Z and Power. Version CRW Image Registry update for Z and Power of modules/olm-pruning-index-image.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CRW Image Registry update for Z and Power
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.5

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.

@codyhoag
Copy link
Contributor

@ktania46 the edited file in this PR did not exist for enterprise-4.5, so the changes were not cherry-picked there. Please follow up with another PR for 4.5 specifically if there's something that needs to be added there. Thanks!

@jianzhangbjz
Copy link
Member

@codyhoag As you may know, this PR leads to a bug https://bugzilla.redhat.com/show_bug.cgi?id=1943150 reported by the customer. So, could you help ask the QE have a review before merging it in the future? Thanks! cc: @adellape
You can reach out to us in the #forum-qe channel of Slack. Like:
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.