diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 872965b995..b6f7341092 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "k8s.io/kubernetes", "GoVersion": "go1.7", - "GodepVersion": "v74", + "GodepVersion": "v79", "Packages": [ "github.com/ugorji/go/codec/codecgen", "github.com/onsi/ginkgo/ginkgo", @@ -16,7 +16,7 @@ { "ImportPath": "bitbucket.org/ww/goautoneg", "Comment": "null-5", - "Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'" + "Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675" }, { "ImportPath": "cloud.google.com/go/compute/metadata", diff --git a/hack/godep-save.sh b/hack/godep-save.sh index cc509be7e9..20b3baf0ff 100755 --- a/hack/godep-save.sh +++ b/hack/godep-save.sh @@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" -kube::util::ensure_godep_version v74 +kube::util::ensure_godep_version v79 # Some things we want in godeps aren't code dependencies, so ./... # won't pick them up. diff --git a/hack/lib/util.sh b/hack/lib/util.sh index df72e0b82a..6a0386a341 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -469,7 +469,8 @@ kube::util::ensure_clean_working_dir() { # Ensure that the given godep version is installed and in the path kube::util::ensure_godep_version() { - if [[ "$(godep version)" == *"godep ${1}"* ]]; then + GODEP_VERSION=${1:-"v79"} + if [[ "$(godep version)" == *"godep ${GODEP_VERSION}"* ]]; then return fi @@ -478,7 +479,7 @@ kube::util::ensure_godep_version() { GOPATH="${KUBE_TEMP}/go" go get -d -u github.com/tools/godep 2>/dev/null pushd "${KUBE_TEMP}/go/src/github.com/tools/godep" >/dev/null - git checkout "${1:-v74}" + git checkout "${GODEP_VERSION}" GOPATH="${KUBE_TEMP}/go" go install . popd >/dev/null diff --git a/hack/update-all.sh b/hack/update-all.sh index e14bf72f96..7e4d130655 100755 --- a/hack/update-all.sh +++ b/hack/update-all.sh @@ -54,7 +54,7 @@ if ! $ALL ; then echo "Running in short-circuit mode; run with -a to force all scripts to run." fi -kube::util::ensure_godep_version v74 +kube::util::ensure_godep_version v79 if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then echo "Running godep restore" @@ -95,4 +95,3 @@ for t in $BASH_TARGETS; do done echo -e "${color_green}Update scripts completed successfully${color_norm}" - diff --git a/hack/update-staging-client-go.sh b/hack/update-staging-client-go.sh index a723c37b81..5ac6b80ac0 100755 --- a/hack/update-staging-client-go.sh +++ b/hack/update-staging-client-go.sh @@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/util.sh" kube::util::ensure_clean_working_dir -kube::util::ensure_godep_version v74 +kube::util::ensure_godep_version v79 cd ${KUBE_ROOT} diff --git a/hack/update-staging-godeps.sh b/hack/update-staging-godeps.sh index aad1c92803..94f7a6b190 100755 --- a/hack/update-staging-godeps.sh +++ b/hack/update-staging-godeps.sh @@ -56,7 +56,7 @@ if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then fi kube::util::ensure-temp-dir -kube::util::ensure_godep_version v74 +kube::util::ensure_godep_version v79 TMP_GOPATH="${KUBE_TEMP}/go" diff --git a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json index f591561b0e..8a315a8279 100644 --- a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json +++ b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "k8s.io/apimachinery", "GoVersion": "go1.7", - "GodepVersion": "v74", + "GodepVersion": "v79", "Packages": [ "./..." ], diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index 9952170938..bc2700c44d 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -1,14 +1,14 @@ { "ImportPath": "k8s.io/apiserver", "GoVersion": "go1.7", - "GodepVersion": "v74", + "GodepVersion": "v79", "Packages": [ "./..." ], "Deps": [ { "ImportPath": "bitbucket.org/ww/goautoneg", - "Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'" + "Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675" }, { "ImportPath": "github.com/PuerkitoBio/purell", diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index 49458bdd37..71471f32ed 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -1,7 +1,7 @@ { "ImportPath": "k8s.io/client-go", "GoVersion": "go1.7", - "GodepVersion": "v74", + "GodepVersion": "v79", "Packages": [ "./..." ], diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index c8bb828e7e..e2c8d7e896 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -1,14 +1,14 @@ { "ImportPath": "k8s.io/kube-aggregator", "GoVersion": "go1.7", - "GodepVersion": "v74", + "GodepVersion": "v79", "Packages": [ "./..." ], "Deps": [ { "ImportPath": "bitbucket.org/ww/goautoneg", - "Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'" + "Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675" }, { "ImportPath": "github.com/PuerkitoBio/purell", diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index a55dce8e08..100a56ae30 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -1,14 +1,14 @@ { "ImportPath": "k8s.io/sample-apiserver", "GoVersion": "go1.7", - "GodepVersion": "v74", + "GodepVersion": "v79", "Packages": [ "./..." ], "Deps": [ { "ImportPath": "bitbucket.org/ww/goautoneg", - "Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'" + "Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675" }, { "ImportPath": "github.com/PuerkitoBio/purell",