Update go version
This commit is contained in:
parent
74ace58ae1
commit
48e7a87741
18 changed files with 90 additions and 83 deletions
|
@ -13,7 +13,7 @@ You need to run the `binary` target. This will create binaries for Linux platfor
|
||||||
$ make binary
|
$ make binary
|
||||||
docker build -t "traefik-dev:no-more-godep-ever" -f build.Dockerfile .
|
docker build -t "traefik-dev:no-more-godep-ever" -f build.Dockerfile .
|
||||||
Sending build context to Docker daemon 295.3 MB
|
Sending build context to Docker daemon 295.3 MB
|
||||||
Step 0 : FROM golang:1.10-alpine
|
Step 0 : FROM golang:1.11-alpine
|
||||||
---> 8c6473912976
|
---> 8c6473912976
|
||||||
Step 1 : RUN go get github.com/golang/dep/cmd/dep
|
Step 1 : RUN go get github.com/golang/dep/cmd/dep
|
||||||
[...]
|
[...]
|
||||||
|
|
2
Gopkg.lock
generated
2
Gopkg.lock
generated
|
@ -1272,7 +1272,7 @@
|
||||||
"roundrobin",
|
"roundrobin",
|
||||||
"utils"
|
"utils"
|
||||||
]
|
]
|
||||||
revision = "f6bbeac6d5c4c06f88ba07ed42983ff36a5b407e"
|
revision = "77148e9694210e5f5610328f1cd7cf65583014c2"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
name = "github.com/vulcand/predicate"
|
name = "github.com/vulcand/predicate"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.10-alpine
|
FROM golang:1.11-alpine
|
||||||
|
|
||||||
RUN apk --update upgrade \
|
RUN apk --update upgrade \
|
||||||
&& apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar \
|
&& apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar \
|
||||||
|
|
|
@ -118,7 +118,7 @@ func (hc *HealthCheck) execute(ctx context.Context, backend *BackendConfig) {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
log.Debug("Stopping current health check goroutines of backend: %s", backend.name)
|
log.Debugf("Stopping current health check goroutines of backend: %s", backend.name)
|
||||||
return
|
return
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
log.Debugf("Refreshing health check for backend: %s", backend.name)
|
log.Debugf("Refreshing health check for backend: %s", backend.name)
|
||||||
|
|
|
@ -45,7 +45,7 @@ func (wl *IPWhiteLister) handle(w http.ResponseWriter, r *http.Request, next htt
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
tracing.SetErrorAndDebugLog(r, "request %+v matched white list %s - passing", r, wl.whiteLister)
|
tracing.SetErrorAndDebugLog(r, "request %+v matched white list %v - passing", r, wl.whiteLister)
|
||||||
next.ServeHTTP(w, r)
|
next.ServeHTTP(w, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,7 @@ func (rr *retryResponseWriterWithoutCloseNotify) Header() http.Header {
|
||||||
|
|
||||||
func (rr *retryResponseWriterWithoutCloseNotify) Write(buf []byte) (int, error) {
|
func (rr *retryResponseWriterWithoutCloseNotify) Write(buf []byte) (int, error) {
|
||||||
if rr.ShouldRetry() {
|
if rr.ShouldRetry() {
|
||||||
return 0, nil
|
return len(buf), nil
|
||||||
}
|
}
|
||||||
return rr.responseWriter.Write(buf)
|
return rr.responseWriter.Write(buf)
|
||||||
}
|
}
|
||||||
|
|
|
@ -386,7 +386,7 @@ func (p *Provider) lookupEc2Instances(ctx context.Context, client *awsClient, cl
|
||||||
})
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Unable to describe instances [%s]: %v", err)
|
log.Errorf("Unable to describe instances: %v", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,7 @@ func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *s
|
||||||
func detectMasters(zk string, masters []string) <-chan []string {
|
func detectMasters(zk string, masters []string) <-chan []string {
|
||||||
changed := make(chan []string, 1)
|
changed := make(chan []string, 1)
|
||||||
if zk != "" {
|
if zk != "" {
|
||||||
log.Debugf("Starting master detector for ZK ", zk)
|
log.Debugf("Starting master detector for ZK %s", zk)
|
||||||
if md, err := detector.New(zk); err != nil {
|
if md, err := detector.New(zk); err != nil {
|
||||||
log.Errorf("Failed to create master detector: %v", err)
|
log.Errorf("Failed to create master detector: %v", err)
|
||||||
} else if err := md.Detect(detect.NewMasters(masters, changed)); err != nil {
|
} else if err := md.Detect(detect.NewMasters(masters, changed)); err != nil {
|
||||||
|
|
|
@ -29,7 +29,7 @@ func (p *Provider) metadataProvide(configurationChan chan<- types.ConfigMessage,
|
||||||
operation := func() error {
|
operation := func() error {
|
||||||
client, err := rancher.NewClientAndWait(metadataServiceURL)
|
client, err := rancher.NewClientAndWait(metadataServiceURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorln("Failed to create Rancher metadata service client: %s", err)
|
log.Errorf("Failed to create Rancher metadata service client: %v", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ func (p *Provider) metadataProvide(configurationChan chan<- types.ConfigMessage,
|
||||||
|
|
||||||
stacks, err := client.GetStacks()
|
stacks, err := client.GetStacks()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Failed to query Rancher metadata service: %s", err)
|
log.Errorf("Failed to query Rancher metadata service: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
11
vendor/github.com/vulcand/oxy/buffer/buffer.go
generated
vendored
11
vendor/github.com/vulcand/oxy/buffer/buffer.go
generated
vendored
|
@ -383,7 +383,14 @@ func (b *bufferWriter) Header() http.Header {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *bufferWriter) Write(buf []byte) (int, error) {
|
func (b *bufferWriter) Write(buf []byte) (int, error) {
|
||||||
return b.buffer.Write(buf)
|
length, err := b.buffer.Write(buf)
|
||||||
|
if err != nil {
|
||||||
|
// Since go1.11 (https://github.com/golang/go/commit/8f38f28222abccc505b9a1992deecfe3e2cb85de)
|
||||||
|
// if the writer returns an error, the reverse proxy panics
|
||||||
|
b.log.Error(err)
|
||||||
|
length = len(buf)
|
||||||
|
}
|
||||||
|
return length, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// WriteHeader sets rw.Code.
|
// WriteHeader sets rw.Code.
|
||||||
|
@ -410,7 +417,7 @@ func (b *bufferWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
|
||||||
return conn, rw, err
|
return conn, rw, err
|
||||||
}
|
}
|
||||||
b.log.Warningf("Upstream ResponseWriter of type %v does not implement http.Hijacker. Returning dummy channel.", reflect.TypeOf(b.responseWriter))
|
b.log.Warningf("Upstream ResponseWriter of type %v does not implement http.Hijacker. Returning dummy channel.", reflect.TypeOf(b.responseWriter))
|
||||||
return nil, nil, fmt.Errorf("The response writer that was wrapped in this proxy, does not implement http.Hijacker. It is of type: %v", reflect.TypeOf(b.responseWriter))
|
return nil, nil, fmt.Errorf("the response writer wrapped in this proxy does not implement http.Hijacker. Its type is: %v”", reflect.TypeOf(b.responseWriter))
|
||||||
}
|
}
|
||||||
|
|
||||||
// SizeErrHandler Size error handler
|
// SizeErrHandler Size error handler
|
||||||
|
|
Loading…
Add table
Reference in a new issue