Merge pull request #17391 from deads2k/glide-01

Automatic merge from submit-queue.

switch to glide

glide.yaml

@@ -0,0 +1,76 @@
+package: github.com/openshift/origin
+excludeDirs:
+- cmd/cluster-capacity
+- cmd/service-catalog
+- pkg/build/builder
+import:
+- package: github.com/coreos/etcd
+  version: v3.2.8
+- package: github.com/gonum/graph
+  version: bde6d0fbd9dec5a997e906611fe0364001364c41
+- package: github.com/google/certificate-transparency
+  repo:    [email protected]:openshift/google-certificate-transparency
+  version: master
+- package: github.com/vishvananda/netlink
+  version: 933b978eae8c18daa1077a0eb7186b689cd9f82d
+- package: github.com/google/cadvisor
+  repo:    [email protected]:openshift/google-cadvisor
+  version: release-0.27.1
+- package: github.com/emicklei/go-restful-swagger12
+  repo:    https://github.com/openshift/emicklei-go-restful-swagger12
+  version: release-1.0.1
+- package: google.golang.org/appengine
+  version: 12d5545dc1cfa6047a286d5e853841b6471f4c19
+- package: github.com/docker/docker
+  version: 4f3616fb1c112e206b88cb7a9922bf49067a7756
+- package: github.com/fsouza/go-dockerclient
+  version: 3f9370a4738ba8d0ed6eea63582ca6db5eb48032
+- package: github.com/cloudflare/cfssl
+  repo:    https://github.com/openshift/cloudflare-cfssl
+  version: stable-20160905
+- package: github.com/skynetservices/skydns
+  repo:    https://github.com/openshift/skynetservices-skydns
+  version: release-2.5.3a
+- package: github.com/onsi/ginkgo
+  repo:    [email protected]:openshift/onsi-ginkgo
+  version: release-v1.2.0
+- package: k8s.io/gengo
+  repo:    [email protected]:openshift/kubernetes-gengo
+  version: openshift-3.8
+- package: k8s.io/kube-openapi
+  version: 868f2f29720b192240e18284659231b440f9cda5
+- package: k8s.io/code-generator
+  repo:    [email protected]:openshift/kubernetes-code-generator
+  version: release-1.8.1
+- package: k8s.io/apimachinery
+  repo:    [email protected]:openshift/kubernetes-apimachinery
+  version: release-1.8.1
+- package: k8s.io/api
+  repo:    [email protected]:openshift/kubernetes-api
+  version: release-1.8.1
+- package: k8s.io/client-go
+  repo:    [email protected]:openshift/kubernetes-client-go
+  version: release-1.8.1
+- package: k8s.io/metrics
+  repo:    [email protected]:openshift/kubernetes-metrics
+  version: release-1.8.1
+- package: k8s.io/apiserver
+  repo:    [email protected]:openshift/kubernetes-apiserver
+  version: release-1.8.1
+- package: k8s.io/kube-aggregator
+  repo:    [email protected]:openshift/kube-aggregator
+  version: release-1.8.1
+- package: k8s.io/apiextensions-apiserver
+  repo:    [email protected]:openshift/kubernetes-apiextensions-apiserver
+  version: release-1.8.1
+- package: k8s.io/kubernetes
+  repo:    [email protected]:openshift/kubernetes
+  version: release-1.8.1
+# only used by pkg/build/builder
+- package: github.com/kubernetes-incubator/cri-o
+  version: a8ee86b1cce0c13bd541a99140682a92635ba9f7
+- package: github.com/containers/image
+  repo:    [email protected]:openshift/containers-image
+  version: openshift-3.8
+- package: github.com/vjeantet/ldapserver
+  version: v1.0

hack/lib/constants.sh

@@ -231,9 +231,11 @@ function os::util::list_test_packages_under() {
       # we need to find all of the kubernetes test suites, excluding those we directly whitelisted before, the end-to-end suite, and
       # the go2idl tests which we currently do not support
       # etcd3 isn't supported yet and that test flakes upstream
+      # cmd wasn't done before using glide and constantly flakes
       find -L vendor/k8s.io/{apimachinery,apiserver,client-go,kube-aggregator,kubernetes} -not \( \
         \(                                                                                          \
           -path "${kubernetes_path}/staging"                                                        \
+          -o -path "${kubernetes_path}/cmd"                                                         \
           -o -path "${kubernetes_path}/test"                                                        \
           -o -path "${kubernetes_path}/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned" \
           -o -path "${kubernetes_path}/pkg/storage/etcd3"                                           \

hack/update-deps.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cd "$(dirname "${BASH_SOURCE}")/.."
+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
+
+# fail early if any of the staging dirs is checked out
+for pkg in "$GOPATH/src/k8s.io/kubernetes/staging/src/k8s.io/"*; do
+  dir=$(basename $pkg)
+  if [ -d "$GOPATH/src/k8s.io/$dir" ]; then
+    echo "Conflicting $GOPATH/src/k8s.io/$dir found. Please remove from GOPATH." 1>&2
+    exit 1
+  fi
+done
+
+# Some things we want in godeps aren't code dependencies, so ./...
+# won't pick them up.
+# TODO seems like this should be failing something somewhere
+#REQUIRED_BINS=(
+#  "github.com/elazarl/goproxy"
+#  "github.com/golang/mock/gomock"
+#  "github.com/containernetworking/cni/plugins/ipam/host-local"
+#  "github.com/containernetworking/cni/plugins/main/loopback"
+#  "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
+#  "k8s.io/code-generator/cmd/client-gen"
+#  "k8s.io/kubernetes/pkg/api/testing/compat"
+#  "k8s.io/kubernetes/test/e2e/generated"
+#  "github.com/onsi/ginkgo/ginkgo"
+#  "github.com/jteeuwen/go-bindata/go-bindata"
+#)
+
+glide update --strip-vendor
+
+# recreate symlinks after vendoring
+for pkg in vendor/k8s.io/kubernetes/staging/src/k8s.io/*; do
+  dir=$(basename $pkg)
+  rm -rf vendor/k8s.io/$dir
+  ln -s kubernetes/staging/src/k8s.io/$dir vendor/k8s.io/$dir
+done