Commit f0fa9e58 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub

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
parents 7291a439 4cd6bf42
...@@ -16,14 +16,13 @@ ...@@ -16,14 +16,13 @@
set -o errexit set -o errexit
set -o pipefail set -o pipefail
set -o nounset
if [[ -z ${KUBE_ROOT} ]]; then if [[ -z "${KUBE_ROOT:-}" ]]; then
echo "KUBE_ROOT not detected, setting default." echo "KUBE_ROOT not detected, setting default."
KUBE_ROOT="../../../" KUBE_ROOT="../../../"
fi fi
set -o nounset
if [[ ! -d "${KUBE_ROOT}/examples" ]]; then 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." echo "${KUBE_ROOT}/examples not detected. This script should be run from a location where the source dirs are available."
exit 1 exit 1
......
...@@ -652,11 +652,6 @@ func podFromManifest(filename string) (*api.Pod, error) { ...@@ -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 // 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. // to flip to Ready, log its output and delete it.
func RunKubernetesServiceTestContainer(c *client.Client, ns string) { 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" path := "test/images/clusterapi-tester/pod.yaml"
p, err := podFromManifest(path) p, err := podFromManifest(path)
if err != nil { if err != nil {
......
...@@ -28,12 +28,6 @@ set -x ...@@ -28,12 +28,6 @@ set -x
. $1 . $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 make generated_files
# TODO converge build steps with hack/build-go some day if possible. # TODO converge build steps with hack/build-go some day if possible.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment