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
ac73dbea
Commit
ac73dbea
authored
Apr 14, 2019
by
Erik Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update vendor
parent
4bba0402
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
8 deletions
+14
-8
trash.lock
trash.lock
+1
-1
vendor.conf
vendor.conf
+1
-1
base.go
vendor/k8s.io/client-go/pkg/version/base.go
+3
-3
server.go
vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go
+1
-0
kubelet_client.go
...or/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go
+5
-0
base.go
vendor/k8s.io/kubernetes/pkg/version/base.go
+3
-3
No files found.
trash.lock
View file @
ac73dbea
...
@@ -295,7 +295,7 @@ import:
...
@@ -295,7 +295,7 @@ import:
- package: k8s.io/klog
- package: k8s.io/klog
version: v0.2.0-14-g8e90cee79f8237
version: v0.2.0-14-g8e90cee79f8237
- package: k8s.io/kubernetes
- package: k8s.io/kubernetes
version: v1.14.1-k3s.
3
version: v1.14.1-k3s.
4
repo: https://github.com/rancher/k3s.git
repo: https://github.com/rancher/k3s.git
transitive: true
transitive: true
staging: true
staging: true
...
...
vendor.conf
View file @
ac73dbea
...
@@ -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
.
14
.
1
-
k3s
.
3
https
://
github
.
com
/
rancher
/
k3s
.
git
transitive
=
true
,
staging
=
true
k8s
.
io
/
kubernetes
v1
.
14
.
1
-
k3s
.
4
https
://
github
.
com
/
rancher
/
k3s
.
git
transitive
=
true
,
staging
=
true
github
.
com
/
rancher
/
norman
50017
efee23caa79542ef685b65a7b783e0a73ca
https
://
github
.
com
/
ibuildthecloud
/
norman
.
git
github
.
com
/
rancher
/
norman
50017
efee23caa79542ef685b65a7b783e0a73ca
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 @
ac73dbea
...
@@ -3,8 +3,8 @@ package version
...
@@ -3,8 +3,8 @@ package version
var
(
var
(
gitMajor
=
"1"
gitMajor
=
"1"
gitMinor
=
"14"
gitMinor
=
"14"
gitVersion
=
"v1.14.1-k3s.
3
"
gitVersion
=
"v1.14.1-k3s.
4
"
gitCommit
=
"
4ebc432f987a09a4e215fc530c3aed911922e4b4
"
gitCommit
=
"
52f3b42401c93c36467f1fd6d294a3aba26c7def
"
gitTreeState
=
"clean"
gitTreeState
=
"clean"
buildDate
=
"2019-04-1
1T20:3
3+00:00Z"
buildDate
=
"2019-04-1
5T22:1
3+00:00Z"
)
)
vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go
View file @
ac73dbea
...
@@ -169,6 +169,7 @@ func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan
...
@@ -169,6 +169,7 @@ func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan
if
DefaultProxyDialerFn
!=
nil
{
if
DefaultProxyDialerFn
!=
nil
{
completedOptions
.
KubeletConfig
.
Dial
=
DefaultProxyDialerFn
completedOptions
.
KubeletConfig
.
Dial
=
DefaultProxyDialerFn
completedOptions
.
KubeletConfig
.
Proxy
=
http
.
ProxyURL
(
nil
)
}
}
kubeAPIServerConfig
,
insecureServingInfo
,
serviceResolver
,
pluginInitializer
,
admissionPostStartHook
,
err
:=
CreateKubeAPIServerConfig
(
completedOptions
,
proxyTransport
)
kubeAPIServerConfig
,
insecureServingInfo
,
serviceResolver
,
pluginInitializer
,
admissionPostStartHook
,
err
:=
CreateKubeAPIServerConfig
(
completedOptions
,
proxyTransport
)
...
...
vendor/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go
View file @
ac73dbea
...
@@ -19,6 +19,7 @@ package client
...
@@ -19,6 +19,7 @@ package client
import
(
import
(
"context"
"context"
"net/http"
"net/http"
"net/url"
"strconv"
"strconv"
"time"
"time"
...
@@ -51,6 +52,9 @@ type KubeletClientConfig struct {
...
@@ -51,6 +52,9 @@ type KubeletClientConfig struct {
// Dial is a custom dialer used for the client
// Dial is a custom dialer used for the client
Dial
utilnet
.
DialFunc
Dial
utilnet
.
DialFunc
// Proxy is a custom proxy function for the client
Proxy
func
(
*
http
.
Request
)
(
*
url
.
URL
,
error
)
}
}
// ConnectionInfo provides the information needed to connect to a kubelet
// ConnectionInfo provides the information needed to connect to a kubelet
...
@@ -77,6 +81,7 @@ func MakeTransport(config *KubeletClientConfig) (http.RoundTripper, error) {
...
@@ -77,6 +81,7 @@ func MakeTransport(config *KubeletClientConfig) (http.RoundTripper, error) {
rt
=
utilnet
.
SetOldTransportDefaults
(
&
http
.
Transport
{
rt
=
utilnet
.
SetOldTransportDefaults
(
&
http
.
Transport
{
DialContext
:
config
.
Dial
,
DialContext
:
config
.
Dial
,
TLSClientConfig
:
tlsConfig
,
TLSClientConfig
:
tlsConfig
,
Proxy
:
config
.
Proxy
,
})
})
}
}
...
...
vendor/k8s.io/kubernetes/pkg/version/base.go
View file @
ac73dbea
...
@@ -3,8 +3,8 @@ package version
...
@@ -3,8 +3,8 @@ package version
var
(
var
(
gitMajor
=
"1"
gitMajor
=
"1"
gitMinor
=
"14"
gitMinor
=
"14"
gitVersion
=
"v1.14.1-k3s.
3
"
gitVersion
=
"v1.14.1-k3s.
4
"
gitCommit
=
"
4ebc432f987a09a4e215fc530c3aed911922e4b4
"
gitCommit
=
"
52f3b42401c93c36467f1fd6d294a3aba26c7def
"
gitTreeState
=
"clean"
gitTreeState
=
"clean"
buildDate
=
"2019-04-1
1T20:3
3+00:00Z"
buildDate
=
"2019-04-1
5T22:1
3+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