Merge pull request #59207 from ipuustin/shell-bugfix
Automatic merge from submit-queue (batch tested with PRs 59705, 59207, 59677). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. build: fix a logic error in shell script. **What this PR does / why we need it**: It looks like that there's a logic error in `build/common.sh`. The return value of a `docker inspect` command is not checked properly, since the value being assigned is actually the previous command's return value (a `0`, because `local` always returns `0` when used like this). **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
This commit is contained in:
		| @@ -501,9 +501,11 @@ function kube::build::ensure_data_container() { | ||||
|   # If the data container exists AND exited successfully, we can use it. | ||||
|   # Otherwise nuke it and start over. | ||||
|   local ret=0 | ||||
|   local code=$(docker inspect \ | ||||
|   local code=0 | ||||
|  | ||||
|   code=$(docker inspect \ | ||||
|       -f '{{.State.ExitCode}}' \ | ||||
|       "${KUBE_DATA_CONTAINER_NAME}" 2>/dev/null || ret=$?) | ||||
|       "${KUBE_DATA_CONTAINER_NAME}" 2>/dev/null) || ret=$? | ||||
|   if [[ "${ret}" == 0 && "${code}" != 0 ]]; then | ||||
|     kube::build::destroy_container "${KUBE_DATA_CONTAINER_NAME}" | ||||
|     ret=1 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Kubernetes Submit Queue
					Kubernetes Submit Queue