File tree 2 files changed +1
-66
lines changed
2 files changed +1
-66
lines changed Original file line number Diff line number Diff line change 3
3
ns=" openshift-storage"
4
4
5
5
POD_TEMPLATE_LATEST=" /templates/pod.template.latest"
6
- POD_TEMPLATE_STANDARD=" /templates/pod.template.standard"
7
6
8
7
SED_DELIMITER=$( echo -en " \001" ) ;
9
8
safe_replace () {
10
9
sed " s${SED_DELIMITER}${1}${SED_DELIMITER}${2}${SED_DELIMITER} g"
11
10
}
12
11
13
- apply_standard_helper_pod () {
14
- < ${POD_TEMPLATE_STANDARD} safe_replace " NAMESPACE" " $1 " | safe_replace " IMAGE_NAME" " $2 " | safe_replace " MUST_GATHER" " $HOSTNAME " > pod_helper.yaml
15
- oc apply -f pod_helper.yaml
16
- }
17
-
18
12
apply_latest_helper_pod () {
19
13
< ${POD_TEMPLATE_LATEST} safe_replace " NAMESPACE" " $1 " | safe_replace " IMAGE_NAME" " $2 " | safe_replace " MUST_GATHER" " $HOSTNAME " > pod_helper.yaml
20
14
oc apply -f pod_helper.yaml
@@ -33,12 +27,7 @@ deploy(){
33
27
echo " not able to find the rook's operator image. Skipping collection of ceph command output" | tee -a " ${BASE_COLLECTION_PATH} " /gather-debug.log
34
28
else
35
29
echo " creating helper pod" | tee -a " ${BASE_COLLECTION_PATH} " /gather-debug.log
36
- current_version=$( oc get csv -n " ${ns} " --no-headers | awk ' {print $5}' | tr -dc ' 0-9' )
37
- if [[ $current_version -ge 460 ]]; then
38
- apply_latest_helper_pod " $ns " " $operatorImage "
39
- else
40
- apply_standard_helper_pod " $ns " " $operatorImage "
41
- fi
30
+ apply_latest_helper_pod " $ns " " $operatorImage "
42
31
fi
43
32
44
33
for node in ${nodes} ; do
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments