fix: multi-arch must-gather image #1494
Conversation
Signed-off-by: Mateus Oliveira <[email protected]>
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mateusoliveira43 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 |
openshift-ci
bot
added
the
approved
must-gather/Dockerfile
Outdated
| @@ -13,21 +13,32 @@ RUN curl --location --output velero.tgz https://github.com/openshift/velero/arch | |||
| curl --location --output restic.tgz https://github.com/openshift/restic/archive/refs/heads/${RESTIC_BRANCH}.tar.gz && \ | |||
| tar -xzvf restic.tgz && cd restic-${RESTIC_BRANCH} && \ | |||
| CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -mod=mod -ldflags '-extldflags "-static"' -o /restic github.com/restic/restic/cmd/restic && \ | |||
| cd .. && rm -rf restic.tgz restic-${RESTIC_BRANCH} | |||
| cd .. && rm -rf restic.tgz restic-${RESTIC_BRANCH} && \ | |||
| curl --location --output oc.tgz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.16/openshift-client-linux-${TARGETARCH}-rhel9.tar.gz && \ | |||
There was a problem hiding this comment.
Here you could use stable (which is currently 4.16), this way we won't need to update once 4.17 is there:
curl --location --output oc.tgz https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux-${TARGETARCH}-rhel9.tar.gz
There was a problem hiding this comment.
I do not like automatically updates
how does prod handles updates for oc @rayfordj ?
There was a problem hiding this comment.
At the moment, manually, until we have an oc available from an el9/ubi9 base image at which time we'll then resume updating via follow_tag as the base image is updated. I'm guessing this likely won't happen until >=v4.17.
There was a problem hiding this comment.
While I lean towards stable to ensure it isn't later forgotten and doesn't rot as has been observed to occur over the years across our repos. I've no objection for upstream to use either a) latest stable or b) latest versioned (such as, stable-v4.16). However, the former will continue to be updated over releases, while the latter will eventually stop being maintained. Regardless, it isn't something that will be carried downstream.
😬
There was a problem hiding this comment.
could copy oc from container image
There was a problem hiding this comment.
changed to stable
there is a handy image for that, Tiger? ones I found, where not in registry.access, so needed auth
Signed-off-by: Mateus Oliveira <[email protected]>
Signed-off-by: Mateus Oliveira <[email protected]>
Why the changes were made
Add support for multi-arch builds of OADP must-gather image
Related to #1487
How to test the changes made
Go to must-gather folder and change
PLATFORMin Makefile and runmake docker-build. Build should succeedCheck that tools removed from Dockerfile are not needed