github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

[minor] couple of quick cleanups for kill reporoot

Browse Source
This commit is contained in:
jayunit100 2016-07-29 20:14:11 -04:00
parent 6166083c78
commit 4cd6bf42af
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/update-bindata.sh
View File

@ -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

5
test/e2e/framework/util.go
View File

@ -653,11 +653,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 {

6
test/e2e_node/jenkins/e2e-node-jenkins.sh
View File

@ -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.