Skip to content

Commit e373c53

Browse files
committed
use script to link to staging folder for patches
1 parent 9e21404 commit e373c53

File tree

3 files changed

+42
-258
lines changed

3 files changed

+42
-258
lines changed

hack/godep-restore.sh

-85
This file was deleted.

hack/godep-save.sh

-173
This file was deleted.

hack/update-deps.sh

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
#!/bin/bash
2+
3+
set -o errexit
4+
set -o nounset
5+
set -o pipefail
6+
7+
cd "$(dirname "${BASH_SOURCE}")/.."
8+
source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
9+
10+
# fail early if any of the staging dirs is checked out
11+
for pkg in "$GOPATH/src/k8s.io/kubernetes/staging/src/k8s.io/"*; do
12+
dir=$(basename $pkg)
13+
if [ -d "$GOPATH/src/k8s.io/$dir" ]; then
14+
echo "Conflicting $GOPATH/src/k8s.io/$dir found. Please remove from GOPATH." 1>&2
15+
exit 1
16+
fi
17+
done
18+
19+
# Some things we want in godeps aren't code dependencies, so ./...
20+
# won't pick them up.
21+
# TODO seems like this should be failing something somewhere
22+
#REQUIRED_BINS=(
23+
# "github.com/elazarl/goproxy"
24+
# "github.com/golang/mock/gomock"
25+
# "github.com/containernetworking/cni/plugins/ipam/host-local"
26+
# "github.com/containernetworking/cni/plugins/main/loopback"
27+
# "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
28+
# "k8s.io/code-generator/cmd/client-gen"
29+
# "k8s.io/kubernetes/pkg/api/testing/compat"
30+
# "k8s.io/kubernetes/test/e2e/generated"
31+
# "github.com/onsi/ginkgo/ginkgo"
32+
# "github.com/jteeuwen/go-bindata/go-bindata"
33+
#)
34+
35+
glide update --strip-vendor
36+
37+
# recreate symlinks after vendoring
38+
for pkg in vendor/k8s.io/kubernetes/staging/src/k8s.io/*; do
39+
dir=$(basename $pkg)
40+
rm -rf vendor/k8s.io/$dir
41+
ln -s kubernetes/staging/src/k8s.io/$dir vendor/k8s.io/$dir
42+
done

0 commit comments

Comments
 (0)