Skip to content

Commit bf41994

Browse files
committed
update go modules
Updates the builder image version to 1.18.5 and updates the go modules to mitigate CVEs. The list of vulnerabilities found in the binaries are listed in [comment](#372 (comment)). Signed-off-by: Imran Pochi <imranpochi@microsoft.com>
1 parent bcef735 commit bf41994

File tree

4 files changed

+446
-41
lines changed

4 files changed

+446
-41
lines changed

artifacts/images/agent-build.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the proxy-agent binary
2-
FROM golang:1.17.12 as builder
2+
FROM golang:1.18.5 as builder
33

44
# Copy in the go src
55
WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy

artifacts/images/server-build.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the proxy-server binary
2-
FROM golang:1.17.12 as builder
2+
FROM golang:1.18.5 as builder
33

44
# Copy in the go src
55
WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy

go.mod

+53-39
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,74 @@
11
module sigs.k8s.io/apiserver-network-proxy
22

3-
go 1.17
3+
go 1.18
44

55
require (
6-
github.com/golang/mock v1.4.4
7-
github.com/golang/protobuf v1.4.3
8-
github.com/google/uuid v1.1.2
9-
github.com/prometheus/client_golang v1.7.1
10-
github.com/spf13/cobra v0.0.3
6+
github.com/golang/mock v1.6.0
7+
github.com/golang/protobuf v1.5.2
8+
github.com/google/uuid v1.3.0
9+
github.com/prometheus/client_golang v1.13.0
10+
github.com/spf13/cobra v1.5.0
1111
github.com/spf13/pflag v1.0.5
12-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
13-
google.golang.org/grpc v1.42.0
14-
k8s.io/api v0.20.10
15-
k8s.io/apimachinery v0.20.10
16-
k8s.io/client-go v0.20.10
17-
k8s.io/component-base v0.20.10
18-
k8s.io/klog/v2 v2.4.0
12+
golang.org/x/net v0.0.0-20220812174116-3211cb980234
13+
google.golang.org/grpc v1.48.0
14+
google.golang.org/protobuf v1.28.1
15+
k8s.io/api v0.24.3
16+
k8s.io/apimachinery v0.24.3
17+
k8s.io/client-go v0.24.3
18+
k8s.io/component-base v0.24.3
19+
k8s.io/klog/v2 v2.70.1
1920
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.0
2021
)
2122

2223
require (
24+
github.com/PuerkitoBio/purell v1.1.1 // indirect
25+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2326
github.com/beorn7/perks v1.0.1 // indirect
24-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
27+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2528
github.com/davecgh/go-spew v1.1.1 // indirect
26-
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
27-
github.com/go-logr/logr v0.2.0 // indirect
29+
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
30+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
31+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
32+
github.com/go-logr/logr v1.2.3 // indirect
33+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
34+
github.com/go-openapi/jsonreference v0.20.0 // indirect
35+
github.com/go-openapi/swag v0.22.0 // indirect
2836
github.com/gogo/protobuf v1.3.2 // indirect
29-
github.com/google/gofuzz v1.1.0 // indirect
30-
github.com/googleapis/gnostic v0.4.1 // indirect
31-
github.com/imdario/mergo v0.3.5 // indirect
32-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
33-
github.com/json-iterator/go v1.1.10 // indirect
37+
github.com/google/gnostic v0.6.9 // indirect
38+
github.com/google/gofuzz v1.2.0 // indirect
39+
github.com/googleapis/gnostic v0.5.5 // indirect
40+
github.com/imdario/mergo v0.3.13 // indirect
41+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
42+
github.com/josharian/intern v1.0.0 // indirect
43+
github.com/json-iterator/go v1.1.12 // indirect
44+
github.com/mailru/easyjson v0.7.7 // indirect
3445
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
3546
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
36-
github.com/modern-go/reflect2 v1.0.1 // indirect
47+
github.com/modern-go/reflect2 v1.0.2 // indirect
48+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3749
github.com/pkg/errors v0.9.1 // indirect
3850
github.com/prometheus/client_model v0.2.0 // indirect
39-
github.com/prometheus/common v0.10.0 // indirect
40-
github.com/prometheus/procfs v0.2.0 // indirect
51+
github.com/prometheus/common v0.37.0 // indirect
52+
github.com/prometheus/procfs v0.8.0 // indirect
4153
go.uber.org/goleak v1.1.10 // indirect
42-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
43-
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
44-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
45-
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd // indirect
46-
golang.org/x/text v0.3.4 // indirect
47-
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
48-
golang.org/x/tools v0.0.0-20210106214847-113979e3529a // indirect
49-
google.golang.org/appengine v1.6.5 // indirect
50-
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
51-
google.golang.org/protobuf v1.26.0-rc.1 // indirect
54+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
55+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
56+
golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 // indirect
57+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
58+
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
59+
golang.org/x/text v0.3.7 // indirect
60+
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
61+
golang.org/x/tools v0.1.10 // indirect
62+
google.golang.org/appengine v1.6.7 // indirect
63+
google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 // indirect
5264
gopkg.in/inf.v0 v0.9.1 // indirect
53-
gopkg.in/yaml.v2 v2.2.8 // indirect
54-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
55-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
56-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
57-
sigs.k8s.io/yaml v1.2.0 // indirect
65+
gopkg.in/yaml.v2 v2.4.0 // indirect
66+
gopkg.in/yaml.v3 v3.0.1 // indirect
67+
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
68+
k8s.io/utils v0.0.0-20220812165043-ad590609e2e5 // indirect
69+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
70+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
71+
sigs.k8s.io/yaml v1.3.0 // indirect
5872
)
5973

6074
replace sigs.k8s.io/apiserver-network-proxy/konnectivity-client => ./konnectivity-client

0 commit comments

Comments
 (0)