Merge pull request #29813 from jayunit100/kill-repo-root-slb-2

Automatic merge from submit-queue

[minor] couple of quick cleanups for kill reporoot

quick fixes from last one,  cc @spxtr @ixdy follow on to  https://github.com/kubernetes/kubernetes/pull/25584
pull/6/head
k8s-merge-robot 2016-07-29 21:42:42 -07:00 committed by GitHub
commit f0fa9e588f
3 changed files with 2 additions and 14 deletions

View File

@ -16,14 +16,13 @@
set -o errexit
set -o pipefail
set -o nounset
if [[ -z ${KUBE_ROOT} ]]; then
if [[ -z "${KUBE_ROOT:-}" ]]; then
echo "KUBE_ROOT not detected, setting default."
KUBE_ROOT="../../../"
fi
set -o nounset
if [[ ! -d "${KUBE_ROOT}/examples" ]]; then
echo "${KUBE_ROOT}/examples not detected. This script should be run from a location where the source dirs are available."
exit 1

View File

@ -652,11 +652,6 @@ func podFromManifest(filename string) (*api.Pod, error) {
// Run a test container to try and contact the Kubernetes api-server from a pod, wait for it
// to flip to Ready, log its output and delete it.
func RunKubernetesServiceTestContainer(c *client.Client, ns string) {
c, err := LoadClient()
if err != nil {
Logf("Failed to load client")
return
}
path := "test/images/clusterapi-tester/pod.yaml"
p, err := podFromManifest(path)
if err != nil {

View File

@ -28,12 +28,6 @@ set -x
. $1
if [ "$INSTALL_GODEP" = true ] ; then
go get -u github.com/tools/godep
go get -u github.com/onsi/ginkgo/ginkgo
go get -u github.com/onsi/gomega
fi
make generated_files
# TODO converge build steps with hack/build-go some day if possible.