Skip to content

Commit 790e2fe

Browse files
committed
Update Go and Alpine versions
That's a first step before we can switch to gomod, and latest client-go (though: more changes are requiered as the dynamic discovery changed since then).
1 parent 327d5c1 commit 790e2fe

File tree

6 files changed

+6
-13
lines changed

6 files changed

+6
-13
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: go
22
go:
3-
- "1.10.x"
3+
- "1.12.x"
44

55
# only needed for e2e tests
66
sudo: required

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM golang:1.10.1 as builder
1+
FROM golang:1.12 as builder
22
WORKDIR /go/src/github.com/bpineau/katafygio
33
COPY . .
44
RUN go get -u github.com/Masterminds/glide
55
RUN make deps
66
RUN make build
77

8-
FROM alpine:3.8
8+
FROM alpine:3.10
99
RUN apk upgrade --no-cache && \
1010
apk --no-cache add ca-certificates git openssh-client tini
1111
RUN install -d -o nobody -g nobody /var/lib/katafygio/data

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ You can also deploy with the provided [helm](https://helm.sh/) chart:
110110
helm install --name kf-backups --namespace kube-system assets/helm-chart/katafygio/
111111
```
112112

113-
If you want to build from sources, assuming you have go 1.10 and glide in the path, and GOPATH configured:
113+
If you want to build from sources, assuming you have go 1.10 or up and glide in the path, and GOPATH configured:
114114

115115
```shell
116116
make deps

assets/Dockerfile.goreleaser

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.8
1+
FROM alpine:3.10
22
RUN apk upgrade --no-cache && \
33
apk --no-cache add ca-certificates git openssh-client tini
44
RUN install -d -o nobody -g nobody /var/lib/katafygio/data

pkg/health/health.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (h *Listener) Start() *Listener {
5252
go func() {
5353
defer close(h.donech)
5454
err := h.srv.ListenAndServe()
55-
if err != nil && err.Error() != "http: Server closed" {
55+
if err != nil && err != http.ErrServerClosed {
5656
h.logger.Errorf("healthcheck server failed: %v", err)
5757
}
5858
}()

pkg/health/health_test.go

-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ func TestNoopHealth(t *testing.T) {
2121
hc := New(logs, 0)
2222
_ = hc.Start()
2323
hc.Stop()
24-
25-
hc = New(logs, -42)
26-
_ = hc.Start()
27-
hc.Stop()
28-
if logs.count != 1 {
29-
t.Error("Failed to log an issue with a bogus port")
30-
}
3124
}
3225

3326
func TestHealthCheck(t *testing.T) {

0 commit comments

Comments
 (0)