Merge pull request #209 from red-hat-storage/sync_ds--main

Syncing latest changes from main for odf-must-gather

Dockerfile

@@ -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

collection-scripts/gather_clusterscoped_resources

@@ -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=()
@@ -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=()
@@ -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/"