mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
Update vendor
This commit is contained in:
parent
4bba04023d
commit
ac73dbea10
@ -295,7 +295,7 @@ import:
|
||||
- package: k8s.io/klog
|
||||
version: v0.2.0-14-g8e90cee79f8237
|
||||
- package: k8s.io/kubernetes
|
||||
version: v1.14.1-k3s.3
|
||||
version: v1.14.1-k3s.4
|
||||
repo: https://github.com/rancher/k3s.git
|
||||
transitive: true
|
||||
staging: true
|
||||
|
@ -9,7 +9,7 @@ package=github.com/opencontainers/runc/libcontainer/nsenter
|
||||
package=github.com/opencontainers/runc/libcontainer/specconv
|
||||
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 50017efee23caa79542ef685b65a7b783e0a73ca https://github.com/ibuildthecloud/norman.git
|
||||
github.com/coreos/flannel 823afe66b2266bf71f5bec24e6e28b26d70cfc7c https://github.com/ibuildthecloud/flannel.git
|
||||
|
6
vendor/k8s.io/client-go/pkg/version/base.go
generated
vendored
6
vendor/k8s.io/client-go/pkg/version/base.go
generated
vendored
@ -3,8 +3,8 @@ package version
|
||||
var (
|
||||
gitMajor = "1"
|
||||
gitMinor = "14"
|
||||
gitVersion = "v1.14.1-k3s.3"
|
||||
gitCommit = "4ebc432f987a09a4e215fc530c3aed911922e4b4"
|
||||
gitVersion = "v1.14.1-k3s.4"
|
||||
gitCommit = "52f3b42401c93c36467f1fd6d294a3aba26c7def"
|
||||
gitTreeState = "clean"
|
||||
buildDate = "2019-04-11T20:33+00:00Z"
|
||||
buildDate = "2019-04-15T22:13+00:00Z"
|
||||
)
|
||||
|
1
vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go
generated
vendored
1
vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go
generated
vendored
@ -169,6 +169,7 @@ func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan
|
||||
|
||||
if DefaultProxyDialerFn != nil {
|
||||
completedOptions.KubeletConfig.Dial = DefaultProxyDialerFn
|
||||
completedOptions.KubeletConfig.Proxy = http.ProxyURL(nil)
|
||||
}
|
||||
|
||||
kubeAPIServerConfig, insecureServingInfo, serviceResolver, pluginInitializer, admissionPostStartHook, err := CreateKubeAPIServerConfig(completedOptions, proxyTransport)
|
||||
|
5
vendor/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go
generated
vendored
5
vendor/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go
generated
vendored
@ -19,6 +19,7 @@ package client
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
@ -51,6 +52,9 @@ type KubeletClientConfig struct {
|
||||
|
||||
// Dial is a custom dialer used for the client
|
||||
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
|
||||
@ -77,6 +81,7 @@ func MakeTransport(config *KubeletClientConfig) (http.RoundTripper, error) {
|
||||
rt = utilnet.SetOldTransportDefaults(&http.Transport{
|
||||
DialContext: config.Dial,
|
||||
TLSClientConfig: tlsConfig,
|
||||
Proxy: config.Proxy,
|
||||
})
|
||||
}
|
||||
|
||||
|
6
vendor/k8s.io/kubernetes/pkg/version/base.go
generated
vendored
6
vendor/k8s.io/kubernetes/pkg/version/base.go
generated
vendored
@ -3,8 +3,8 @@ package version
|
||||
var (
|
||||
gitMajor = "1"
|
||||
gitMinor = "14"
|
||||
gitVersion = "v1.14.1-k3s.3"
|
||||
gitCommit = "4ebc432f987a09a4e215fc530c3aed911922e4b4"
|
||||
gitVersion = "v1.14.1-k3s.4"
|
||||
gitCommit = "52f3b42401c93c36467f1fd6d294a3aba26c7def"
|
||||
gitTreeState = "clean"
|
||||
buildDate = "2019-04-11T20:33+00:00Z"
|
||||
buildDate = "2019-04-15T22:13+00:00Z"
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user