diff --git a/trash.lock b/trash.lock index d4d4f99a49e..48eafc62718 100755 --- a/trash.lock +++ b/trash.lock @@ -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 diff --git a/vendor.conf b/vendor.conf index c4fbff542a0..9baa515b1e9 100644 --- a/vendor.conf +++ b/vendor.conf @@ -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 diff --git a/vendor/k8s.io/client-go/pkg/version/base.go b/vendor/k8s.io/client-go/pkg/version/base.go index a1c4f1e4393..38efa5e5d70 100644 --- a/vendor/k8s.io/client-go/pkg/version/base.go +++ b/vendor/k8s.io/client-go/pkg/version/base.go @@ -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" ) diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go index f4409d2aa55..92192b5abb8 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go @@ -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) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go b/vendor/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go index bde19b76e66..af2e4deeaae 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/client/kubelet_client.go @@ -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, }) } diff --git a/vendor/k8s.io/kubernetes/pkg/version/base.go b/vendor/k8s.io/kubernetes/pkg/version/base.go index a1c4f1e4393..38efa5e5d70 100644 --- a/vendor/k8s.io/kubernetes/pkg/version/base.go +++ b/vendor/k8s.io/kubernetes/pkg/version/base.go @@ -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" )