Merge pull request #118191 from liggitt/local-up
fix using stale binaries in local-up-cluster
This commit is contained in:
		@@ -186,10 +186,10 @@ do
 | 
				
			|||||||
    esac
 | 
					    esac
 | 
				
			||||||
done
 | 
					done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -z "${GO_OUT:-$(guess_built_binary_path)}" ]; then
 | 
					if [ -z "${GO_OUT}" ]; then
 | 
				
			||||||
    make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/kube-apiserver cmd/kube-controller-manager cmd/cloud-controller-manager cmd/kubelet cmd/kube-proxy cmd/kube-scheduler"
 | 
					    make -C "${KUBE_ROOT}" WHAT="cmd/kubectl cmd/kube-apiserver cmd/kube-controller-manager cmd/cloud-controller-manager cmd/kubelet cmd/kube-proxy cmd/kube-scheduler"
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
    echo "skipped the build as we found existing binaries in $(guess_built_binary_path)"
 | 
					    echo "skipped the build because GO_OUT was set (${GO_OUT})"
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Shut down anyway if there's an error.
 | 
					# Shut down anyway if there's an error.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user