Skip to content

Commit 1443c07

Browse files
committed
must-gather: rename latest pod template
Signed-off-by: Mudit Agarwal <[email protected]>
1 parent 622a008 commit 1443c07

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

must-gather/collection-scripts/pre-install.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
ns="openshift-storage"
44

5-
POD_TEMPLATE_LATEST="/templates/pod.template.latest"
5+
POD_TEMPLATE="/templates/pod.template"
66

77
SED_DELIMITER=$(echo -en "\001");
88
safe_replace () {
99
sed "s${SED_DELIMITER}${1}${SED_DELIMITER}${2}${SED_DELIMITER}g"
1010
}
1111

12-
apply_latest_helper_pod() {
13-
< ${POD_TEMPLATE_LATEST} safe_replace "NAMESPACE" "$1" | safe_replace "IMAGE_NAME" "$2" | safe_replace "MUST_GATHER" "$HOSTNAME" > pod_helper.yaml
12+
apply_helper_pod() {
13+
< ${POD_TEMPLATE} safe_replace "NAMESPACE" "$1" | safe_replace "IMAGE_NAME" "$2" | safe_replace "MUST_GATHER" "$HOSTNAME" > pod_helper.yaml
1414
oc apply -f pod_helper.yaml
1515
}
1616

@@ -27,7 +27,7 @@ deploy(){
2727
echo "not able to find the rook's operator image. Skipping collection of ceph command output" | tee -a "${BASE_COLLECTION_PATH}"/gather-debug.log
2828
else
2929
echo "creating helper pod" | tee -a "${BASE_COLLECTION_PATH}"/gather-debug.log
30-
apply_latest_helper_pod "$ns" "$operatorImage"
30+
apply_helper_pod "$ns" "$operatorImage"
3131
fi
3232

3333
for node in ${nodes}; do
File renamed without changes.

0 commit comments

Comments
 (0)