Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
d31a88fe
Unverified
Commit
d31a88fe
authored
Mar 12, 2017
by
Christoph Blecker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump godep version to v79
parent
da20ffda
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
17 additions
and
17 deletions
+17
-17
Godeps.json
Godeps/Godeps.json
+2
-2
godep-save.sh
hack/godep-save.sh
+1
-1
util.sh
hack/lib/util.sh
+3
-2
update-all.sh
hack/update-all.sh
+1
-2
update-staging-client-go.sh
hack/update-staging-client-go.sh
+1
-1
update-staging-godeps.sh
hack/update-staging-godeps.sh
+1
-1
Godeps.json
staging/src/k8s.io/apimachinery/Godeps/Godeps.json
+1
-1
Godeps.json
staging/src/k8s.io/apiserver/Godeps/Godeps.json
+2
-2
Godeps.json
staging/src/k8s.io/client-go/Godeps/Godeps.json
+1
-1
Godeps.json
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
+2
-2
Godeps.json
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
+2
-2
No files found.
Godeps/Godeps.json
View file @
d31a88fe
{
{
"ImportPath"
:
"k8s.io/kubernetes"
,
"ImportPath"
:
"k8s.io/kubernetes"
,
"GoVersion"
:
"go1.7"
,
"GoVersion"
:
"go1.7"
,
"GodepVersion"
:
"v7
4
"
,
"GodepVersion"
:
"v7
9
"
,
"Packages"
:
[
"Packages"
:
[
"github.com/ugorji/go/codec/codecgen"
,
"github.com/ugorji/go/codec/codecgen"
,
"github.com/onsi/ginkgo/ginkgo"
,
"github.com/onsi/ginkgo/ginkgo"
,
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
{
{
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"Comment"
:
"null-5"
,
"Comment"
:
"null-5"
,
"Rev"
:
"
'75cd24fc2f2c2a2088577d12123ddee5f54e0675'
"
"Rev"
:
"
75cd24fc2f2c2a2088577d12123ddee5f54e0675
"
},
},
{
{
"ImportPath"
:
"cloud.google.com/go/compute/metadata"
,
"ImportPath"
:
"cloud.google.com/go/compute/metadata"
,
...
...
hack/godep-save.sh
View file @
d31a88fe
...
@@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
...
@@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source
"
${
KUBE_ROOT
}
/hack/lib/init.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/init.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/util.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/util.sh"
kube::util::ensure_godep_version v7
4
kube::util::ensure_godep_version v7
9
# Some things we want in godeps aren't code dependencies, so ./...
# Some things we want in godeps aren't code dependencies, so ./...
# won't pick them up.
# won't pick them up.
...
...
hack/lib/util.sh
View file @
d31a88fe
...
@@ -469,7 +469,8 @@ kube::util::ensure_clean_working_dir() {
...
@@ -469,7 +469,8 @@ kube::util::ensure_clean_working_dir() {
# Ensure that the given godep version is installed and in the path
# Ensure that the given godep version is installed and in the path
kube::util::ensure_godep_version
()
{
kube::util::ensure_godep_version
()
{
if
[[
"
$(
godep version
)
"
==
*
"godep
${
1
}
"
*
]]
;
then
GODEP_VERSION
=
${
1
:-
"v79"
}
if
[[
"
$(
godep version
)
"
==
*
"godep
${
GODEP_VERSION
}
"
*
]]
;
then
return
return
fi
fi
...
@@ -478,7 +479,7 @@ kube::util::ensure_godep_version() {
...
@@ -478,7 +479,7 @@ kube::util::ensure_godep_version() {
GOPATH
=
"
${
KUBE_TEMP
}
/go"
go get
-d
-u
github.com/tools/godep 2>/dev/null
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
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
.
GOPATH
=
"
${
KUBE_TEMP
}
/go"
go
install
.
popd
>
/dev/null
popd
>
/dev/null
...
...
hack/update-all.sh
View file @
d31a88fe
...
@@ -54,7 +54,7 @@ if ! $ALL ; then
...
@@ -54,7 +54,7 @@ if ! $ALL ; then
echo
"Running in short-circuit mode; run with -a to force all scripts to run."
echo
"Running in short-circuit mode; run with -a to force all scripts to run."
fi
fi
kube::util::ensure_godep_version v7
4
kube::util::ensure_godep_version v7
9
if
!
kube::util::godep_restored 2>&1 |
sed
's/^/ /'
;
then
if
!
kube::util::godep_restored 2>&1 |
sed
's/^/ /'
;
then
echo
"Running godep restore"
echo
"Running godep restore"
...
@@ -95,4 +95,3 @@ for t in $BASH_TARGETS; do
...
@@ -95,4 +95,3 @@ for t in $BASH_TARGETS; do
done
done
echo
-e
"
${
color_green
}
Update scripts completed successfully
${
color_norm
}
"
echo
-e
"
${
color_green
}
Update scripts completed successfully
${
color_norm
}
"
hack/update-staging-client-go.sh
View file @
d31a88fe
...
@@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
...
@@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source
"
${
KUBE_ROOT
}
/hack/lib/util.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/util.sh"
kube::util::ensure_clean_working_dir
kube::util::ensure_clean_working_dir
kube::util::ensure_godep_version v7
4
kube::util::ensure_godep_version v7
9
cd
${
KUBE_ROOT
}
cd
${
KUBE_ROOT
}
...
...
hack/update-staging-godeps.sh
View file @
d31a88fe
...
@@ -56,7 +56,7 @@ if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then
...
@@ -56,7 +56,7 @@ if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then
fi
fi
kube::util::ensure-temp-dir
kube::util::ensure-temp-dir
kube::util::ensure_godep_version v7
4
kube::util::ensure_godep_version v7
9
TMP_GOPATH
=
"
${
KUBE_TEMP
}
/go"
TMP_GOPATH
=
"
${
KUBE_TEMP
}
/go"
...
...
staging/src/k8s.io/apimachinery/Godeps/Godeps.json
View file @
d31a88fe
{
{
"ImportPath"
:
"k8s.io/apimachinery"
,
"ImportPath"
:
"k8s.io/apimachinery"
,
"GoVersion"
:
"go1.7"
,
"GoVersion"
:
"go1.7"
,
"GodepVersion"
:
"v7
4
"
,
"GodepVersion"
:
"v7
9
"
,
"Packages"
:
[
"Packages"
:
[
"./..."
"./..."
],
],
...
...
staging/src/k8s.io/apiserver/Godeps/Godeps.json
View file @
d31a88fe
{
{
"ImportPath"
:
"k8s.io/apiserver"
,
"ImportPath"
:
"k8s.io/apiserver"
,
"GoVersion"
:
"go1.7"
,
"GoVersion"
:
"go1.7"
,
"GodepVersion"
:
"v7
4
"
,
"GodepVersion"
:
"v7
9
"
,
"Packages"
:
[
"Packages"
:
[
"./..."
"./..."
],
],
"Deps"
:
[
"Deps"
:
[
{
{
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"Rev"
:
"
'75cd24fc2f2c2a2088577d12123ddee5f54e0675'
"
"Rev"
:
"
75cd24fc2f2c2a2088577d12123ddee5f54e0675
"
},
},
{
{
"ImportPath"
:
"github.com/PuerkitoBio/purell"
,
"ImportPath"
:
"github.com/PuerkitoBio/purell"
,
...
...
staging/src/k8s.io/client-go/Godeps/Godeps.json
View file @
d31a88fe
{
{
"ImportPath"
:
"k8s.io/client-go"
,
"ImportPath"
:
"k8s.io/client-go"
,
"GoVersion"
:
"go1.7"
,
"GoVersion"
:
"go1.7"
,
"GodepVersion"
:
"v7
4
"
,
"GodepVersion"
:
"v7
9
"
,
"Packages"
:
[
"Packages"
:
[
"./..."
"./..."
],
],
...
...
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json
View file @
d31a88fe
{
{
"ImportPath"
:
"k8s.io/kube-aggregator"
,
"ImportPath"
:
"k8s.io/kube-aggregator"
,
"GoVersion"
:
"go1.7"
,
"GoVersion"
:
"go1.7"
,
"GodepVersion"
:
"v7
4
"
,
"GodepVersion"
:
"v7
9
"
,
"Packages"
:
[
"Packages"
:
[
"./..."
"./..."
],
],
"Deps"
:
[
"Deps"
:
[
{
{
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"Rev"
:
"
'75cd24fc2f2c2a2088577d12123ddee5f54e0675'
"
"Rev"
:
"
75cd24fc2f2c2a2088577d12123ddee5f54e0675
"
},
},
{
{
"ImportPath"
:
"github.com/PuerkitoBio/purell"
,
"ImportPath"
:
"github.com/PuerkitoBio/purell"
,
...
...
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json
View file @
d31a88fe
{
{
"ImportPath"
:
"k8s.io/sample-apiserver"
,
"ImportPath"
:
"k8s.io/sample-apiserver"
,
"GoVersion"
:
"go1.7"
,
"GoVersion"
:
"go1.7"
,
"GodepVersion"
:
"v7
4
"
,
"GodepVersion"
:
"v7
9
"
,
"Packages"
:
[
"Packages"
:
[
"./..."
"./..."
],
],
"Deps"
:
[
"Deps"
:
[
{
{
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"ImportPath"
:
"bitbucket.org/ww/goautoneg"
,
"Rev"
:
"
'75cd24fc2f2c2a2088577d12123ddee5f54e0675'
"
"Rev"
:
"
75cd24fc2f2c2a2088577d12123ddee5f54e0675
"
},
},
{
{
"ImportPath"
:
"github.com/PuerkitoBio/purell"
,
"ImportPath"
:
"github.com/PuerkitoBio/purell"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment