Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/olm-installing-opm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $ oc image extract {registry-image} \
ifndef::openshift-origin[]
-a ${REG_CREDS} \
endif::[]
--path /usr/bin/registry/opm:. \
--path /usr/bin/opm:. \
--confirm
----

Expand All @@ -63,7 +63,7 @@ $ oc image extract {registry-image} \
ifndef::openshift-origin[]
-a ${REG_CREDS} \
endif::[]
--path /usr/bin/registry/darwin-amd64-opm:. \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@skrthomas So it looks like you removed the registry/ path which is good, but you also changed the name of the binary from darwin-amd64-opm to just opm.

I'm not sure if that change is appropriate or not, but that's something that I would ask @zhouying7780 to confirm.

Or maybe @adellape knows a good SME on the Operator team to ask?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just double-checked, and they should remain as darwin-amd64-opm and windows-amd64-opm for those binaries.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

$ oc image extract registry.redhat.io/openshift4/ose-operator-registry:v4.6     -a ${REG_CREDS}     --path /usr/bin/windows-amd64-opm:. --confirm

W0128 10:31:30.601994  176229 manifest.go:414] Chose linux/amd64 manifest from the list.
To include the manifest list digest: sha256:490035a0394c1f6aa32f193b61a28f983801ef467339729d4a724bb4b3ec7f7e, use --keep-manifest-list=true

$ oc image extract registry.redhat.io/openshift4/ose-operator-registry:v4.6     -a ${REG_CREDS}     --path /usr/bin/darwin-amd64-opm:. --confirm

W0128 10:32:10.349443  176319 manifest.go:414] Chose linux/amd64 manifest from the list.
To include the manifest list digest: sha256:490035a0394c1f6aa32f193b61a28f983801ef467339729d4a724bb4b3ec7f7e, use --keep-manifest-list=true

$ ll
total 156072
-rw-r-----. 1 durant durant 67038328 Jan 15 19:30 darwin-amd64-opm
-rw-r-----. 1 durant durant 92769624 Jan 15 19:31 windows-amd64-opm

--path /usr/bin/opm:. \
--confirm
----

Expand All @@ -84,7 +84,7 @@ C:\> oc image extract {registry-image} \
ifndef::openshift-origin[]
-a ${REG_CREDS} \
endif::[]
--path /usr/bin/registry/windows-amd64-opm:. \
--path /usr/bin/opm:. \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same question for @zhouying7780 if the binary needs to stay windows-amd64-opm or if it should just be opm for windows.

--confirm
----

Expand Down