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
012bdcb9
Commit
012bdcb9
authored
Feb 23, 2019
by
Darren Shepherd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update vendor
parent
828ce5a2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
7 deletions
+21
-7
trash.lock
trash.lock
+0
-0
vendor.conf
vendor.conf
+1
-1
base.go
vendor/k8s.io/client-go/pkg/version/base.go
+3
-3
predicate.go
vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate.go
+14
-0
base.go
vendor/k8s.io/kubernetes/pkg/version/base.go
+3
-3
No files found.
trash.lock
View file @
012bdcb9
This diff is collapsed.
Click to expand it.
vendor.conf
View file @
012bdcb9
...
@@ -9,7 +9,7 @@ package=github.com/opencontainers/runc/libcontainer/nsenter
...
@@ -9,7 +9,7 @@ package=github.com/opencontainers/runc/libcontainer/nsenter
package
=
github
.
com
/
opencontainers
/
runc
/
libcontainer
/
specconv
package
=
github
.
com
/
opencontainers
/
runc
/
libcontainer
/
specconv
package
=
github
.
com
/
opencontainers
/
runc
/
contrib
/
cmd
/
recvtty
package
=
github
.
com
/
opencontainers
/
runc
/
contrib
/
cmd
/
recvtty
k8s
.
io
/
kubernetes
v1
.
13
.
3
-
k3s
.
5
https
://
github
.
com
/
ibuildthecloud
/
k3s
.
git
transitive
=
true
,
staging
=
true
k8s
.
io
/
kubernetes
v1
.
13
.
3
-
k3s
.
6
https
://
github
.
com
/
rancher
/
k3s
.
git
transitive
=
true
,
staging
=
true
github
.
com
/
rancher
/
norman
816007443
daf04e96c7806c2a637dfab8ede9429
https
://
github
.
com
/
ibuildthecloud
/
norman
.
git
github
.
com
/
rancher
/
norman
816007443
daf04e96c7806c2a637dfab8ede9429
https
://
github
.
com
/
ibuildthecloud
/
norman
.
git
github
.
com
/
coreos
/
flannel
823
afe66b2266bf71f5bec24e6e28b26d70cfc7c
https
://
github
.
com
/
ibuildthecloud
/
flannel
.
git
github
.
com
/
coreos
/
flannel
823
afe66b2266bf71f5bec24e6e28b26d70cfc7c
https
://
github
.
com
/
ibuildthecloud
/
flannel
.
git
...
...
vendor/k8s.io/client-go/pkg/version/base.go
View file @
012bdcb9
...
@@ -3,8 +3,8 @@ package version
...
@@ -3,8 +3,8 @@ package version
var
(
var
(
gitMajor
=
"1"
gitMajor
=
"1"
gitMinor
=
"13"
gitMinor
=
"13"
gitVersion
=
"v1.13.3-k3s.
5
"
gitVersion
=
"v1.13.3-k3s.
6
"
gitCommit
=
"
2379cb94d1165598b63c54bcc6d1da2b2f5c3338
"
gitCommit
=
"
da4e14f160174f356b1d95198f48439971cc8a85
"
gitTreeState
=
"clean"
gitTreeState
=
"clean"
buildDate
=
"2019-02-2
3T01:17
+00:00Z"
buildDate
=
"2019-02-2
4T05:21
+00:00Z"
)
)
vendor/k8s.io/kubernetes/pkg/kubelet/lifecycle/predicate.go
View file @
012bdcb9
...
@@ -18,6 +18,7 @@ package lifecycle
...
@@ -18,6 +18,7 @@ package lifecycle
import
(
import
(
"fmt"
"fmt"
"time"
"k8s.io/klog"
"k8s.io/klog"
...
@@ -56,6 +57,19 @@ func NewPredicateAdmitHandler(getNodeAnyWayFunc getNodeAnyWayFuncType, admission
...
@@ -56,6 +57,19 @@ func NewPredicateAdmitHandler(getNodeAnyWayFunc getNodeAnyWayFuncType, admission
}
}
func
(
w
*
predicateAdmitHandler
)
Admit
(
attrs
*
PodAdmitAttributes
)
PodAdmitResult
{
func
(
w
*
predicateAdmitHandler
)
Admit
(
attrs
*
PodAdmitAttributes
)
PodAdmitResult
{
result
:=
w
.
admit
(
attrs
)
for
i
:=
0
;
i
<
10
;
i
++
{
if
result
.
Admit
{
break
}
time
.
Sleep
(
time
.
Second
)
result
=
w
.
admit
(
attrs
)
}
return
result
}
func
(
w
*
predicateAdmitHandler
)
admit
(
attrs
*
PodAdmitAttributes
)
PodAdmitResult
{
node
,
err
:=
w
.
getNodeAnyWayFunc
()
node
,
err
:=
w
.
getNodeAnyWayFunc
()
if
err
!=
nil
{
if
err
!=
nil
{
klog
.
Errorf
(
"Cannot get Node info: %v"
,
err
)
klog
.
Errorf
(
"Cannot get Node info: %v"
,
err
)
...
...
vendor/k8s.io/kubernetes/pkg/version/base.go
View file @
012bdcb9
...
@@ -3,8 +3,8 @@ package version
...
@@ -3,8 +3,8 @@ package version
var
(
var
(
gitMajor
=
"1"
gitMajor
=
"1"
gitMinor
=
"13"
gitMinor
=
"13"
gitVersion
=
"v1.13.3-k3s.
5
"
gitVersion
=
"v1.13.3-k3s.
6
"
gitCommit
=
"
2379cb94d1165598b63c54bcc6d1da2b2f5c3338
"
gitCommit
=
"
da4e14f160174f356b1d95198f48439971cc8a85
"
gitTreeState
=
"clean"
gitTreeState
=
"clean"
buildDate
=
"2019-02-2
3T01:17
+00:00Z"
buildDate
=
"2019-02-2
4T05:21
+00:00Z"
)
)
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