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.

Sign up for GitHub

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

Jump to bottom

OADP-1801: Include restic and velero binaries in must-gather image, and gather various pieces of version information. #994

Merged
merged 15 commits into from
May 6, 2023
Merged

OADP-1801: Include restic and velero binaries in must-gather image, and gather various pieces of version information. #994

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4035ff6
Build restic and velero for must-gather image.
mrnold May 2, 2023
e4e8c51
Clean up build steps to avoid running out of space.
mrnold May 2, 2023
05ba965
Record versions of OADP and volsync operators.
mrnold May 3, 2023
2dbb772
Respect skip_tls option in gather_versions.
mrnold May 3, 2023
5aded03
Move oadp-debug-info to cluster subdirectory.
mrnold May 3, 2023
871a0c0
Get restic version in must-gather.
mrnold May 3, 2023
525d505
Get velero client and deployment versions.
mrnold May 3, 2023
91f63d9
Get storage classes (short) and DPA details.
mrnold May 4, 2023
d330687
Add debug script directory and a small example.
mrnold May 4, 2023
ddf28b9
Create directory up front, avoid whole DPA CR.
mrnold May 4, 2023
f55dad7
Save full YAML for DPAs and StorageClasses.
mrnold May 5, 2023
96e206d
Remove default SC, add CSI VSC gathering.
mrnold May 5, 2023
1cf93ca
Add defaults for debug file and skip_tls.
mrnold May 5, 2023
5195fed
Add missing --insecure-skip-tls-verify arguments.
mrnold May 5, 2023
7b52ea0
One more missing --insecure-skip-tls-verify.
mrnold May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions must-gather/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
FROM quay.io/konveyor/builder:latest as konveyor-builder
ARG RESTIC_BRANCH=konveyor-0.15.0
kaovilai marked this conversation as resolved.
Show resolved Hide resolved
ARG VELERO_BRANCH=konveyor-dev
WORKDIR /build
RUN curl --location --output velero.tgz https://github.com/openshift/velero/archive/refs/heads/${VELERO_BRANCH}.tar.gz && \
curl --location --output restic.tgz https://github.com/openshift/restic/archive/refs/heads/${RESTIC_BRANCH}.tar.gz && \
tar -xzvf velero.tgz && cd velero-${VELERO_BRANCH} && \
CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static" -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${VELERO_BRANCH}' -o /velero github.com/vmware-tanzu/velero/cmd/velero && cd .. && \
tar -xzvf restic.tgz && cd restic-${RESTIC_BRANCH} && \
CGO_ENABLED=0 GOOS=linux go build -a -mod=mod -ldflags '-extldflags "-static"' -o /restic github.com/restic/restic/cmd/restic

FROM registry.access.redhat.com/ubi8/go-toolset:1.17.10 as gobuilder

RUN go install -v github.com/google/pprof@latest
Expand All @@ -10,6 +21,8 @@ RUN microdnf -y install rsync tar gzip graphviz findutils

COPY --from=gobuilder /opt/app-root/src/go/bin/pprof /usr/bin/pprof
COPY --from=builder /usr/bin/oc /usr/bin/oc
COPY --from=konveyor-builder /velero /usr/bin/velero
COPY --from=konveyor-builder /restic /usr/bin/restic

COPY collection-scripts/* /usr/bin/
COPY collection-scripts/logs/* /usr/bin/
Expand Down