Skip to content
This repository was archived by the owner on Mar 5, 2024. It is now read-only.

Commit 2883914

Browse files
authored
upgrade to v1.20 libraries, fixes issue#484 (#507)
1 parent 0ab9484 commit 2883914

File tree

4 files changed

+279
-79
lines changed

4 files changed

+279
-79
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13.8 as build
1+
FROM golang:1.15.15 as build
22
ENV GO111MODULE=on
33

44
WORKDIR /workspace
@@ -14,6 +14,8 @@ COPY pkg/ pkg/
1414
COPY proto/ proto/
1515
COPY Makefile Makefile
1616

17+
# As (generated) proto/service.pb.go is _also_ committed, void the need to install protoc / protoc-gen-go plugin
18+
RUN touch proto/service.pb.go
1719
RUN make bin/kiam-linux-amd64
1820

1921
FROM alpine:3.11

go.mod

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@ require (
88
github.com/coreos/go-iptables v0.3.0
99
github.com/fortytw2/leaktest v1.3.0
1010
github.com/golang/protobuf v1.4.3
11-
github.com/googleapis/gnostic v0.2.0 // indirect
1211
github.com/gorilla/mux v1.7.3
1312
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
1413
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
15-
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
16-
github.com/imdario/mergo v0.3.4 // indirect
17-
github.com/onsi/ginkgo v1.10.3 // indirect
1814
github.com/onsi/gomega v1.7.1 // indirect
1915
github.com/patrickmn/go-cache v2.1.0+incompatible
2016
github.com/prometheus/client_golang v1.8.0
@@ -23,16 +19,14 @@ require (
2319
github.com/vmg/backoff v1.0.0
2420
golang.org/x/net v0.0.0-20201216054612-986b41b23924 // indirect
2521
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e // indirect
26-
golang.org/x/text v0.3.4 // indirect
2722
google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d // indirect
28-
google.golang.org/grpc v1.34.0
23+
google.golang.org/grpc v1.36.0
24+
google.golang.org/grpc/examples v0.0.0-20211020220737-f00baa6c3c84 // indirect
2925
google.golang.org/grpc/security/advancedtls v0.0.0-20200204204621-648cf9b00e25
3026
google.golang.org/protobuf v1.25.0
3127
gopkg.in/alecthomas/kingpin.v2 v2.2.6
3228
gopkg.in/fsnotify.v1 v1.4.7
33-
gopkg.in/inf.v0 v0.9.1 // indirect
34-
k8s.io/api v0.0.0-20180521142803-feb48db456a5
35-
k8s.io/apimachinery v0.0.0-20180515182440-31dade610c05
36-
k8s.io/client-go v7.0.0+incompatible
37-
k8s.io/kube-openapi v0.0.0-20180629012420-d83b052f768a // indirect
29+
k8s.io/api v0.20.0
30+
k8s.io/apimachinery v0.20.0
31+
k8s.io/client-go v0.20.0
3832
)

0 commit comments

Comments
 (0)