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

Syncing latest changes from main for odf-must-gather #209

Merged
merged 4 commits into from
Nov 11, 2024
Merged

Syncing latest changes from main for odf-must-gather #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2386e0
include storageclusterpeer info
yati1998 Nov 6, 2024
ef5afd9
Merge pull request #205 from yati1998/storageclusterpeer
openshift-merge-bot[bot] Nov 6, 2024
d49df9f
gather: Fix rsync of files from the must-gather pod
black-dragon74 Nov 8, 2024
af5296e
Merge pull request #207 from black-dragon74/fix-rsync
openshift-merge-bot[bot] Nov 8, 2024
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
11 changes: 4 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
FROM registry.ci.openshift.org/ocp/4.17:cli

WORKDIR /tmp
WORKDIR /usr/bin
COPY collection-scripts .

COPY . .

RUN mkdir -p /templates

COPY collection-scripts/* /usr/bin/
COPY templates/* /templates/
WORKDIR /
COPY templates ./templates

# We do not need it as of now
# jq is not preinstalled on openshift/origin-cli either
Expand Down
3 changes: 3 additions & 0 deletions collection-scripts/gather_clusterscoped_resources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ commands_get+=("volumesnapshotclass")
commands_get+=("volumesnapshotcontent")
commands_get+=("volumegroupsnapshotclass")
commands_get+=("volumegroupsnapshotcontent")
commands_get+=("storageclusterpeers")

# collect yaml output of OC commands
oc_yamls=()
Expand All @@ -41,6 +42,7 @@ oc_yamls+=("volumesnapshotclass")
oc_yamls+=("volumesnapshotcontent")
oc_yamls+=("volumegroupsnapshotclass")
oc_yamls+=("volumegroupsnapshotcontent")
oc_yamls+=("storageclusterpeers")

# collect describe output of OC commands
commands_desc=()
Expand All @@ -59,6 +61,7 @@ commands_desc+=("volumesnapshotclass")
commands_desc+=("volumesnapshotcontent")
commands_desc+=("volumegroupsnapshotclass")
commands_desc+=("volumegroupsnapshotcontent")
commands_desc+=("storageclusterpeers")

# collection path for OC commands
mkdir -p "${BASE_COLLECTION_PATH}/cluster-scoped-resources/oc_output/"
Expand Down
Loading