Commit f6e0bad9 authored by Darren Shepherd's avatar Darren Shepherd

Update vendor

parent b07727ae
...@@ -9,9 +9,9 @@ package=github.com/opencontainers/runc/libcontainer/nsenter ...@@ -9,9 +9,9 @@ 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-k3s2 https://github.com/ibuildthecloud/k3s.git transitive=true,staging=true k8s.io/kubernetes v1.13.3-k3s.5 https://github.com/ibuildthecloud/k3s.git transitive=true,staging=true
github.com/rancher/norman e4f12a1656cb04b4b2a25c571fc05283ec25f946 https://github.com/ibuildthecloud/norman.git github.com/rancher/norman 816007443daf04e96c7806c2a637dfab8ede9429 https://github.com/ibuildthecloud/norman.git
github.com/coreos/flannel 823afe66b2266bf71f5bec24e6e28b26d70cfc7c https://github.com/ibuildthecloud/flannel.git github.com/coreos/flannel 823afe66b2266bf71f5bec24e6e28b26d70cfc7c https://github.com/ibuildthecloud/flannel.git
github.com/natefinch/lumberjack aee4629129445bbdfb69aa565537dcfa16544311 github.com/natefinch/lumberjack aee4629129445bbdfb69aa565537dcfa16544311
github.com/gorilla/mux v1.6.2 github.com/gorilla/mux v1.6.2
......
...@@ -55,7 +55,7 @@ func NewSQLite() *driver.Generic { ...@@ -55,7 +55,7 @@ func NewSQLite() *driver.Generic {
ListResumeSQL: strings.Replace(strings.Replace(baseList, "%REV%", "WHERE kvi.revision <= ?", -1), ListResumeSQL: strings.Replace(strings.Replace(baseList, "%REV%", "WHERE kvi.revision <= ?", -1),
"%RES%", "and kv.name > ? ", -1), "%RES%", "and kv.name > ? ", -1),
InsertSQL: insertSQL, InsertSQL: insertSQL,
ReplaySQL: "SELECT id, " + fieldList + " FROM key_value WHERE name like ? and revision > ? ORDER BY revision ASC", ReplaySQL: "SELECT id, " + fieldList + " FROM key_value WHERE name like ? and revision >= ? ORDER BY revision ASC",
GetRevisionSQL: "SELECT MAX(revision) FROM key_value", GetRevisionSQL: "SELECT MAX(revision) FROM key_value",
ToDeleteSQL: "SELECT count(*) c, name, max(revision) FROM key_value GROUP BY name HAVING c > 1 or (c = 1 and del = 1)", ToDeleteSQL: "SELECT count(*) c, name, max(revision) FROM key_value GROUP BY name HAVING c > 1 or (c = 1 and del = 1)",
DeleteOldSQL: "DELETE FROM key_value WHERE name = ? AND (revision < ? OR (revision = ? AND del = 1))", DeleteOldSQL: "DELETE FROM key_value WHERE name = ? AND (revision < ? OR (revision = ? AND del = 1))",
......
...@@ -60,6 +60,6 @@ func (s *SimpleProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { ...@@ -60,6 +60,6 @@ func (s *SimpleProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
if s.overrideHostHeader { if s.overrideHostHeader {
req.Host = u.Host req.Host = u.Host
} }
httpProxy := proxy.NewUpgradeAwareHandler(&u, s.transport, true, false, er) httpProxy := proxy.NewUpgradeAwareHandler(&u, s.transport, false, false, er)
httpProxy.ServeHTTP(rw, req) httpProxy.ServeHTTP(rw, req)
} }
...@@ -2,9 +2,9 @@ package version ...@@ -2,9 +2,9 @@ package version
var ( var (
gitMajor = "1" gitMajor = "1"
gitMinor = "12" gitMinor = "13"
gitVersion = "v1.13.3-k3s2" gitVersion = "v1.13.3-k3s.5"
gitCommit = "be564389fea07be8ce9258066fec9212a55c4ff0" gitCommit = "2379cb94d1165598b63c54bcc6d1da2b2f5c3338"
gitTreeState = "clean" gitTreeState = "clean"
buildDate = "2019-02-08T04:01+00:00Z" buildDate = "2019-02-23T01:17+00:00Z"
) )
...@@ -20,6 +20,7 @@ limitations under the License. ...@@ -20,6 +20,7 @@ limitations under the License.
package app package app
import ( import (
"crypto/tls"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
...@@ -160,11 +161,16 @@ func Run(completeOptions completedServerRunOptions, stopCh <-chan struct{}) erro ...@@ -160,11 +161,16 @@ func Run(completeOptions completedServerRunOptions, stopCh <-chan struct{}) erro
// CreateServerChain creates the apiservers connected via delegation. // CreateServerChain creates the apiservers connected via delegation.
func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan struct{}) (*master.Config, *genericapiserver.GenericAPIServer, error) { func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan struct{}) (*master.Config, *genericapiserver.GenericAPIServer, error) {
proxyTransport, err := CreateNodeDialer(completedOptions)
if err != nil {
return nil, nil, err
}
if DefaultProxyDialerFn != nil { if DefaultProxyDialerFn != nil {
completedOptions.KubeletConfig.Dial = DefaultProxyDialerFn completedOptions.KubeletConfig.Dial = DefaultProxyDialerFn
} }
kubeAPIServerConfig, insecureServingInfo, serviceResolver, pluginInitializer, admissionPostStartHook, err := CreateKubeAPIServerConfig(completedOptions) kubeAPIServerConfig, insecureServingInfo, serviceResolver, pluginInitializer, admissionPostStartHook, err := CreateKubeAPIServerConfig(completedOptions, proxyTransport)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
...@@ -225,9 +231,20 @@ func CreateKubeAPIServer(kubeAPIServerConfig *master.Config, delegateAPIServer g ...@@ -225,9 +231,20 @@ func CreateKubeAPIServer(kubeAPIServerConfig *master.Config, delegateAPIServer g
return kubeAPIServer, nil return kubeAPIServer, nil
} }
// CreateNodeDialer creates the dialer infrastructure to connect to the nodes.
func CreateNodeDialer(s completedServerRunOptions) (*http.Transport, error) {
proxyTLSClientConfig := &tls.Config{InsecureSkipVerify: true}
proxyTransport := utilnet.SetTransportDefaults(&http.Transport{
DialContext: nil,
TLSClientConfig: proxyTLSClientConfig,
})
return proxyTransport, nil
}
// CreateKubeAPIServerConfig creates all the resources for running the API server, but runs none of them // CreateKubeAPIServerConfig creates all the resources for running the API server, but runs none of them
func CreateKubeAPIServerConfig( func CreateKubeAPIServerConfig(
s completedServerRunOptions, s completedServerRunOptions,
proxyTransport *http.Transport,
) ( ) (
config *master.Config, config *master.Config,
insecureServingInfo *genericapiserver.DeprecatedInsecureServingInfo, insecureServingInfo *genericapiserver.DeprecatedInsecureServingInfo,
...@@ -239,7 +256,7 @@ func CreateKubeAPIServerConfig( ...@@ -239,7 +256,7 @@ func CreateKubeAPIServerConfig(
var genericConfig *genericapiserver.Config var genericConfig *genericapiserver.Config
var storageFactory *serverstorage.DefaultStorageFactory var storageFactory *serverstorage.DefaultStorageFactory
var versionedInformers clientgoinformers.SharedInformerFactory var versionedInformers clientgoinformers.SharedInformerFactory
genericConfig, versionedInformers, insecureServingInfo, serviceResolver, pluginInitializers, admissionPostStartHook, storageFactory, lastErr = buildGenericConfig(s.ServerRunOptions) genericConfig, versionedInformers, insecureServingInfo, serviceResolver, pluginInitializers, admissionPostStartHook, storageFactory, lastErr = buildGenericConfig(s.ServerRunOptions, proxyTransport)
if lastErr != nil { if lastErr != nil {
return return
} }
...@@ -269,6 +286,7 @@ func CreateKubeAPIServerConfig( ...@@ -269,6 +286,7 @@ func CreateKubeAPIServerConfig(
EventTTL: s.EventTTL, EventTTL: s.EventTTL,
KubeletClientConfig: s.KubeletConfig, KubeletClientConfig: s.KubeletConfig,
EnableLogsSupport: s.EnableLogsHandler, EnableLogsSupport: s.EnableLogsHandler,
ProxyTransport: proxyTransport,
ServiceIPRange: serviceIPRange, ServiceIPRange: serviceIPRange,
APIServerServiceIP: apiServerServiceIP, APIServerServiceIP: apiServerServiceIP,
...@@ -293,6 +311,7 @@ func CreateKubeAPIServerConfig( ...@@ -293,6 +311,7 @@ func CreateKubeAPIServerConfig(
// BuildGenericConfig takes the master server options and produces the genericapiserver.Config associated with it // BuildGenericConfig takes the master server options and produces the genericapiserver.Config associated with it
func buildGenericConfig( func buildGenericConfig(
s *options.ServerRunOptions, s *options.ServerRunOptions,
proxyTransport *http.Transport,
) ( ) (
genericConfig *genericapiserver.Config, genericConfig *genericapiserver.Config,
versionedInformers clientgoinformers.SharedInformerFactory, versionedInformers clientgoinformers.SharedInformerFactory,
...@@ -385,7 +404,7 @@ func buildGenericConfig( ...@@ -385,7 +404,7 @@ func buildGenericConfig(
} }
serviceResolver = buildServiceResolver(s.EnableAggregatorRouting, genericConfig.LoopbackClientConfig.Host, versionedInformers) serviceResolver = buildServiceResolver(s.EnableAggregatorRouting, genericConfig.LoopbackClientConfig.Host, versionedInformers)
authInfoResolverWrapper := webhook.NewDefaultAuthenticationInfoResolverWrapper(nil, genericConfig.LoopbackClientConfig) authInfoResolverWrapper := webhook.NewDefaultAuthenticationInfoResolverWrapper(proxyTransport, genericConfig.LoopbackClientConfig)
lastErr = s.Audit.ApplyTo( lastErr = s.Audit.ApplyTo(
genericConfig, genericConfig,
...@@ -401,7 +420,7 @@ func buildGenericConfig( ...@@ -401,7 +420,7 @@ func buildGenericConfig(
return return
} }
pluginInitializers, admissionPostStartHook, err = admissionConfig.New(nil, serviceResolver) pluginInitializers, admissionPostStartHook, err = admissionConfig.New(proxyTransport, serviceResolver)
if err != nil { if err != nil {
lastErr = fmt.Errorf("failed to create admission plugin initializer: %v", err) lastErr = fmt.Errorf("failed to create admission plugin initializer: %v", err)
return return
......
...@@ -11,7 +11,7 @@ package=k8s.io/kubernetes ...@@ -11,7 +11,7 @@ package=k8s.io/kubernetes
package=k8s.io/kubernetes/cmd/hyperkube package=k8s.io/kubernetes/cmd/hyperkube
$(cat ./Godeps/Godeps.json | jq -r '(.Deps | .[] | "\(.ImportPath) \(.Comment) \(.Rev)\n")' | sed 's/null//' | awk '{print $1 " " $2}' | grep -Ev 'github.com/opencontainers/runc|bitbucket.org/ww/goautoneg|github.com/google/cadvisor' | sort -k2,1 | uniq -f1) $(cat ./Godeps/Godeps.json | jq -r '(.Deps | .[] | "\(.ImportPath) \(.Comment) \(.Rev)\n")' | sed 's/null//' | awk '{print $1 " " $2}' | grep -Ev 'github.com/opencontainers/runc|bitbucket.org/ww/goautoneg|github.com/google/cadvisor' | sort -k2,1 | uniq -f1)
bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git
github.com/ibuildthecloud/kvsql 1ca8c57d636e999d0363f4e7d953e96e13c1a2f4 github.com/ibuildthecloud/kvsql c649f12fe5250718e4e024b8b40e7de796ab095e
github.com/google/cadvisor 91dab6eb91496ed68acbef68b02b34b3392ca754 https://github.com/ibuildthecloud/cadvisor.git github.com/google/cadvisor 91dab6eb91496ed68acbef68b02b34b3392ca754 https://github.com/ibuildthecloud/cadvisor.git
github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb
EOF EOF
......
...@@ -2,9 +2,9 @@ package version ...@@ -2,9 +2,9 @@ package version
var ( var (
gitMajor = "1" gitMajor = "1"
gitMinor = "12" gitMinor = "13"
gitVersion = "v1.13.3-k3s2" gitVersion = "v1.13.3-k3s.5"
gitCommit = "be564389fea07be8ce9258066fec9212a55c4ff0" gitCommit = "2379cb94d1165598b63c54bcc6d1da2b2f5c3338"
gitTreeState = "clean" gitTreeState = "clean"
buildDate = "2019-02-08T04:01+00:00Z" buildDate = "2019-02-23T01:17+00:00Z"
) )
...@@ -12,7 +12,7 @@ package version ...@@ -12,7 +12,7 @@ package version
var ( var (
gitMajor = "1" gitMajor = "1"
gitMinor = "12" gitMinor = "$(echo $1 | cut -f2 -d.)"
gitVersion = "$1" gitVersion = "$1"
gitCommit = "$(git rev-parse HEAD)" gitCommit = "$(git rev-parse HEAD)"
gitTreeState = "clean" gitTreeState = "clean"
......
...@@ -205,6 +205,6 @@ k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed ...@@ -205,6 +205,6 @@ k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed
sigs.k8s.io/yaml v1.1.0 sigs.k8s.io/yaml v1.1.0
vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394
bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git
github.com/ibuildthecloud/kvsql 1ca8c57d636e999d0363f4e7d953e96e13c1a2f4 github.com/ibuildthecloud/kvsql c649f12fe5250718e4e024b8b40e7de796ab095e
github.com/google/cadvisor 91dab6eb91496ed68acbef68b02b34b3392ca754 https://github.com/ibuildthecloud/cadvisor.git github.com/google/cadvisor 91dab6eb91496ed68acbef68b02b34b3392ca754 https://github.com/ibuildthecloud/cadvisor.git
github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment