github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81061 from k-toyoda-pi/fix_shellcheck_flexvolume_node_setup

Browse Source 
Fix shellcheck failure in gce/gci/flexvolume_node_setup.sh
This commit is contained in:
Kubernetes Prow Robot 2019-09-16 14:43:54 -07:00 committed by GitHub
commit 1bebaea417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cluster/gce/gci/flexvolume_node_setup.sh
View File

@ -41,7 +41,7 @@ usage() {
exit 1 exit 1
} }
if [ -z ${MOUNTER_IMAGE} ]; then if [ -z "${MOUNTER_IMAGE}" ]; then
echo "ERROR: No Container Registry mounter image is specified." echo "ERROR: No Container Registry mounter image is specified."
echo echo
usage usage
@ -50,7 +50,7 @@ fi
# Unmounts a mount point lazily. If a mount point does not exist, continue silently, # Unmounts a mount point lazily. If a mount point does not exist, continue silently,
# and without error. # and without error.
umount_silent() { umount_silent() {
umount -l $1 &> /dev/null || /bin/true umount -l "$1" &> /dev/null || /bin/true
} }
# Waits for kubelet to restart for 1 minute. # Waits for kubelet to restart for 1 minute.
@ -82,10 +82,10 @@ flex_clean() {
rm -rf ${MOUNTER_PATH} rm -rf ${MOUNTER_PATH}
if [[ -n ${IMAGE_URL:-} ]]; then if [[ -n ${IMAGE_URL:-} ]]; then
docker rmi -f ${IMAGE_URL} &> /dev/null || /bin/true docker rmi -f "${IMAGE_URL}" &> /dev/null || /bin/true
fi fi
if [[ -n ${MOUNTER_DEFAULT_NAME:-} ]]; then if [[ -n ${MOUNTER_DEFAULT_NAME:-} ]]; then
docker rm -f ${MOUNTER_DEFAULT_NAME} &> /dev/null || /bin/true docker rm -f "${MOUNTER_DEFAULT_NAME}" &> /dev/null || /bin/true
fi fi
} }
@ -99,31 +99,31 @@ generate_chroot_wrapper() {
exit 1 exit 1
fi fi
for driver_dir in ${MOUNTER_PATH}/flexvolume/*; do for driver_dir in "${MOUNTER_PATH}/flexvolume"/*; do
if [ -d "$driver_dir" ]; then if [ -d "$driver_dir" ]; then
filecount=$(ls -1 $driver_dir | wc -l) filecount=$(cd "$driver_dir"; find . -mindepth 1 -maxdepth 1 -print0 | xargs -0 -n1 basename | wc -l)
if [ $filecount -gt 1 ]; then if [ "$filecount" -gt 1 ]; then
echo "ERROR: Expected 1 file in the FlexVolume directory but found $filecount." echo "ERROR: Expected 1 file in the FlexVolume directory but found $filecount."
exit 1 exit 1
fi fi
driver_file=$( ls $driver_dir | head -n 1 ) driver_file=$(cd "$driver_dir"; find . -mindepth 1 -maxdepth 1 -print0 | xargs -0 -n1 basename | head -n 1)
# driver_path points to the actual driver inside the mount utility image, # driver_path points to the actual driver inside the mount utility image,
# relative to image root. # relative to image root.
# wrapper_path is the wrapper script location, which is known to kubelet. # wrapper_path is the wrapper script location, which is known to kubelet.
driver_path=flexvolume/$( basename $driver_dir )/${driver_file} driver_path=flexvolume/$( basename "$driver_dir" )/${driver_file}
wrapper_dir=${VOLUME_PLUGIN_DIR}/$( basename $driver_dir ) wrapper_dir=${VOLUME_PLUGIN_DIR}/$( basename "$driver_dir" )
wrapper_path=${wrapper_dir}/${driver_file} wrapper_path=${wrapper_dir}/${driver_file}
mkdir -p $wrapper_dir mkdir -p "$wrapper_dir"
cat >$wrapper_path <<EOF cat >"$wrapper_path" <<EOF
#!/usr/bin/env bash #!/usr/bin/env bash
chroot ${MOUNTER_PATH} ${driver_path} "\$@" chroot ${MOUNTER_PATH} ${driver_path} "\$@"
EOF EOF
chmod 755 $wrapper_path chmod 755 "$wrapper_path"
echo "FlexVolume driver installed at ${wrapper_path}" echo "FlexVolume driver installed at ${wrapper_path}"
fi fi
done done
@ -139,11 +139,11 @@ ACCESS_TOKEN=$(curl -s -H 'Metadata-Flavor: Google' $SVC_ACCT_ENDPOINT/token | c
PROJECT_ID=$(curl -s -H 'Metadata-Flavor: Google' $METADATA/project/project-id) PROJECT_ID=$(curl -s -H 'Metadata-Flavor: Google' $METADATA/project/project-id)
IMAGE_URL=gcr.io/${PROJECT_ID}/${MOUNTER_IMAGE} IMAGE_URL=gcr.io/${PROJECT_ID}/${MOUNTER_IMAGE}
MOUNTER_DEFAULT_NAME=flexvolume_mounter MOUNTER_DEFAULT_NAME=flexvolume_mounter
sudo -u ${SUDO_USER} docker login -u _token -p $ACCESS_TOKEN https://gcr.io > /dev/null sudo -u "${SUDO_USER}" docker login -u _token -p "$ACCESS_TOKEN" https://gcr.io > /dev/null
sudo -u ${SUDO_USER} docker run --name=${MOUNTER_DEFAULT_NAME} ${IMAGE_URL} sudo -u "${SUDO_USER}" docker run --name=${MOUNTER_DEFAULT_NAME} "${IMAGE_URL}"
docker export ${MOUNTER_DEFAULT_NAME} > /tmp/${MOUNTER_DEFAULT_NAME}.tar docker export ${MOUNTER_DEFAULT_NAME} > /tmp/${MOUNTER_DEFAULT_NAME}.tar
docker rm ${MOUNTER_DEFAULT_NAME} > /dev/null docker rm ${MOUNTER_DEFAULT_NAME} > /dev/null
docker rmi ${IMAGE_URL} > /dev/null docker rmi "${IMAGE_URL}" > /dev/null
echo echo
echo "Loading mount utilities onto this instance..." echo "Loading mount utilities onto this instance..."
@ -175,8 +175,7 @@ echo "Restarting Kubelet..."
echo echo
systemctl restart kubelet.service systemctl restart kubelet.service
kubelet_wait if kubelet_wait; then
if [ $? -eq 0 ]; then
echo echo
echo "FlexVolume is ready." echo "FlexVolume is ready."
else else

1
hack/.shellcheck_failures
View File

@ -6,7 +6,6 @@
./cluster/gce/config-test.sh ./cluster/gce/config-test.sh
./cluster/gce/gci/configure-helper.sh ./cluster/gce/gci/configure-helper.sh
./cluster/gce/gci/configure.sh ./cluster/gce/gci/configure.sh
./cluster/gce/gci/flexvolume_node_setup.sh
./cluster/gce/gci/health-monitor.sh ./cluster/gce/gci/health-monitor.sh
./cluster/gce/gci/master-helper.sh ./cluster/gce/gci/master-helper.sh
./cluster/gce/upgrade.sh ./cluster/gce/upgrade.sh