Fix allignment issue in shellscript

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2020-01-20 16:58:30 +05:30 committed by Humble Devassy Chirammal
parent 50a84fb930
commit 520ceb6dcb
3 changed files with 40 additions and 39 deletions

View File

@ -61,7 +61,8 @@ build_push_images() {
# build and push per arch images # build and push per arch images
for ARCH in amd64 arm64; do for ARCH in amd64 arm64; do
ifs=$IFS; IFS= ifs=$IFS
IFS=
digest=$(awk -v ARCH=${ARCH} '{if (archfound) {print $NF; exit 0}}; {archfound=($0 ~ "arch.*"ARCH)}' <<<"${manifests}") digest=$(awk -v ARCH=${ARCH} '{if (archfound) {print $NF; exit 0}}; {archfound=($0 ~ "arch.*"ARCH)}' <<<"${manifests}")
IFS=$ifs IFS=$ifs
sed -i "s|\(^FROM.*\)${baseimg}.*$|\1${baseimg}@${digest}|" "${dockerfile}" sed -i "s|\(^FROM.*\)${baseimg}.*$|\1${baseimg}@${digest}|" "${dockerfile}"

View File

@ -47,7 +47,7 @@ function check_ceph_cluster_health(){
if [ "$CEPH_STATE" = "Created" ]; then if [ "$CEPH_STATE" = "Created" ]; then
if [ "$CEPH_HEALTH" = "HEALTH_OK" ]; then if [ "$CEPH_HEALTH" = "HEALTH_OK" ]; then
echo "Creating CEPH cluster is done. [$CEPH_HEALTH]" echo "Creating CEPH cluster is done. [$CEPH_HEALTH]"
break; break
fi fi
fi fi
done done
@ -64,11 +64,11 @@ function check_mds_stat(){
ACTIVE_COUNT_NUM=$((ACTIVE_COUNT + 0)) ACTIVE_COUNT_NUM=$((ACTIVE_COUNT + 0))
echo "MDS ($FS_NAME) active_count: [$ACTIVE_COUNT_NUM]" echo "MDS ($FS_NAME) active_count: [$ACTIVE_COUNT_NUM]"
if ((ACTIVE_COUNT_NUM < 1)); then if ((ACTIVE_COUNT_NUM < 1)); then
continue; continue
else else
if kubectl -n rook-ceph get pod -l rook_file_system=myfs | grep Running &>/dev/null; then if kubectl -n rook-ceph get pod -l rook_file_system=myfs | grep Running &>/dev/null; then
echo "Filesystem ($FS_NAME) is successfully created..." echo "Filesystem ($FS_NAME) is successfully created..."
break; break
fi fi
fi fi
done done