@@ -2,10 +2,16 @@ language: go

 go:

   - 1.4

+  - 1.5

 env:

- - TEST_ASSETS=true

- - TEST_ASSETS=false

+  - TEST_ASSETS=true

+  - TEST_ASSETS=false

+

+matrix:

+  exclude:

+  - go: 1.5

+    env: TEST_ASSETS=true

 install:

   - export PATH=$GOPATH/bin:./_tools/etcd/bin:$PATH

@@ -485,29 +485,49 @@ KUBE_GIT_VERSION='${KUBE_GIT_VERSION-}'

 EOF

 }

+# golang 1.5 wants `-X key=val`, but golang 1.4- REQUIRES `-X key val`

+os::build::ldflag() {

+  local key=${1}

+  local val=${2}

+

+  GO_VERSION=($(go version))

+

+  if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.5') ]]; then

+    echo "-X ${OS_GO_PACKAGE}/pkg/version.${key} ${val}"

+  else

+    echo "-X ${OS_GO_PACKAGE}/pkg/version.${key}=${val}"

+  fi

+}

+

 # os::build::ldflags calculates the -ldflags argument for building OpenShift

 os::build::ldflags() {

-  (

-    # Run this in a subshell to prevent settings/variables from leaking.

-    set -o errexit

-    set -o nounset

-    set -o pipefail

+  # Run this in a subshell to prevent settings/variables from leaking.

+  set -o errexit

+  set -o nounset

+  set -o pipefail

+

+  cd "${OS_ROOT}"

+

+  os::build::get_version_vars

-    cd "${OS_ROOT}"

+  declare -a ldflags=()

-    os::build::get_version_vars

+  ldflags+=($(os::build::ldflag "majorFromGit" "${OS_GIT_MAJOR}"))

+  ldflags+=($(os::build::ldflag "minorFromGit" "${OS_GIT_MINOR}"))

+  ldflags+=($(os::build::ldflag "versionFromGit" "${OS_GIT_VERSION}"))

+  ldflags+=($(os::build::ldflag "commitFromGit" "${OS_GIT_COMMIT}"))

-    declare -a ldflags=()

-    ldflags+=(-X "${OS_GO_PACKAGE}/pkg/version.majorFromGit" "${OS_GIT_MAJOR}")

-    ldflags+=(-X "${OS_GO_PACKAGE}/pkg/version.minorFromGit" "${OS_GIT_MINOR}")

-    ldflags+=(-X "${OS_GO_PACKAGE}/pkg/version.versionFromGit" "${OS_GIT_VERSION}")

-    ldflags+=(-X "${OS_GO_PACKAGE}/pkg/version.commitFromGit" "${OS_GIT_COMMIT}")

+  GO_VERSION=($(go version))

+  if [[ -z $(echo "${GO_VERSION[2]}" | grep -E 'go1.5') ]]; then

     ldflags+=(-X "k8s.io/kubernetes/pkg/version.gitCommit" "${KUBE_GIT_COMMIT}")

     ldflags+=(-X "k8s.io/kubernetes/pkg/version.gitVersion" "${KUBE_GIT_VERSION}")

+  else

+    ldflags+=(-X "k8s.io/kubernetes/pkg/version.gitCommit=${KUBE_GIT_COMMIT}")

+    ldflags+=(-X "k8s.io/kubernetes/pkg/version.gitVersion=${KUBE_GIT_VERSION}")

+  fi

-    # The -ldflags parameter takes a single string, so join the output.

-    echo "${ldflags[*]-}"

-  )

+  # The -ldflags parameter takes a single string, so join the output.

+  echo "${ldflags[*]-}"

 }

 # os::build::require_clean_tree exits if the current Git tree is not clean.

@@ -8,7 +8,6 @@ import (

 	"github.com/golang/glog"

 	"github.com/gonum/graph"

 	"github.com/gonum/graph/encoding/dot"

-	"github.com/gonum/graph/internal"

 	"github.com/gonum/graph/path"

 	kapi "k8s.io/kubernetes/pkg/api"

 	utilerrors "k8s.io/kubernetes/pkg/util/errors"

@@ -205,7 +204,7 @@ func outputHelper(info, namespace string, singleNamespace bool) string {

 type DepthFirst struct {

 	EdgeFilter func(graph.Edge) bool

 	Visit      func(u, v graph.Node)

-	stack      internal.NodeStack

+	stack      NodeStack

 }

 // Walk performs a depth-first traversal of the graph g starting from the given node

@@ -247,3 +246,22 @@ func (d *DepthFirst) visited(id int) bool {

 	}

 	return false

 }

+

+// NodeStack implements a LIFO stack of graph.Node.

+// NodeStack is internal only in go 1.5.

+type NodeStack []graph.Node

+

+// Len returns the number of graph.Nodes on the stack.

+func (s *NodeStack) Len() int { return len(*s) }

+

+// Pop returns the last graph.Node on the stack and removes it

+// from the stack.

+func (s *NodeStack) Pop() graph.Node {

+	v := *s

+	v, n := v[:len(v)-1], v[len(v)-1]

+	*s = v

+	return n

+}

+

+// Push adds the node n to the stack at the last position.

+func (s *NodeStack) Push(n graph.Node) { *s = append(*s, n) }