Skip to content

Commit 6dbe19a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #739 from vteratipally/adjf
update golang to 1.20
2 parents ff4af1b + e8b55ac commit 6dbe19a

File tree

47 files changed

+119
-853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+119
-853
lines changed

Diff for: ‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
# limitations under the License.
1414
ARG BASEIMAGE
1515

16-
FROM golang:1.17.7 as builder
16+
FROM golang:1.20.0@sha256:f69d47fedd3b2ebd23bcf473c0b78522ebbc1823f06b7d47f45f04a30bdc901d as builder
1717
LABEL maintainer="Andy Xie <[email protected]>"
1818

1919
ENV GOPATH /gopath/
2020
ENV PATH $GOPATH/bin:$PATH
2121

2222
RUN apt-get update --fix-missing && apt-get --yes install libsystemd-dev gcc-aarch64-linux-gnu
2323
RUN go version
24-
RUN go get github.com/tools/godep
24+
RUN go install github.com/tools/godep@latest
2525
RUN godep version
2626

2727
COPY . /gopath/src/k8s.io/node-problem-detector/

Diff for: ‎go.mod

+55-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
module k8s.io/node-problem-detector
22

3-
go 1.15
3+
go 1.20
44

55
require (
66
cloud.google.com/go v0.45.1
77
code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c
88
contrib.go.opencensus.io/exporter/prometheus v0.0.0-20190427222117-f6cda26f80a3
99
contrib.go.opencensus.io/exporter/stackdriver v0.13.4
10-
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
1110
github.com/acobaugh/osrelease v0.0.0-20181218015638-a93a0a55a249
1211
github.com/avast/retry-go v2.4.1+incompatible
1312
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
1413
github.com/euank/go-kmsg-parser v2.0.0+incompatible
15-
github.com/go-ole/go-ole v1.2.4 // indirect
1614
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
1715
github.com/google/cadvisor v0.36.0
1816
github.com/hpcloud/tail v1.0.0
@@ -25,7 +23,6 @@ require (
2523
github.com/shirou/gopsutil v2.19.12+incompatible
2624
github.com/spf13/pflag v1.0.5
2725
github.com/stretchr/testify v1.6.1
28-
github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc // indirect
2926
go.opencensus.io v0.22.4
3027
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
3128
golang.org/x/sys v0.0.0-20210112080510-489259a85091
@@ -38,4 +35,58 @@ require (
3835
k8s.io/test-infra v0.0.0-20190914015041-e1cbc3ccd91c
3936
)
4037

38+
require (
39+
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
40+
github.com/aws/aws-sdk-go v1.23.20 // indirect
41+
github.com/beorn7/perks v1.0.1 // indirect
42+
github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
43+
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf // indirect
44+
github.com/davecgh/go-spew v1.1.1 // indirect
45+
github.com/fsnotify/fsnotify v1.4.9 // indirect
46+
github.com/go-ole/go-ole v1.2.4 // indirect
47+
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
48+
github.com/gogo/protobuf v1.3.1 // indirect
49+
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
50+
github.com/golang/protobuf v1.4.2 // indirect
51+
github.com/google/go-cmp v0.4.0 // indirect
52+
github.com/google/gofuzz v1.0.0 // indirect
53+
github.com/google/uuid v1.1.1 // indirect
54+
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
55+
github.com/googleapis/gnostic v0.3.1 // indirect
56+
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
57+
github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874 // indirect
58+
github.com/imdario/mergo v0.3.7 // indirect
59+
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
60+
github.com/json-iterator/go v1.1.7 // indirect
61+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
62+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
63+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
64+
github.com/modern-go/reflect2 v1.0.1 // indirect
65+
github.com/nxadm/tail v1.4.8 // indirect
66+
github.com/pmezard/go-difflib v1.0.0 // indirect
67+
github.com/prometheus/client_golang v0.9.4 // indirect
68+
github.com/sirupsen/logrus v1.4.2 // indirect
69+
github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc // indirect
70+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
71+
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
72+
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
73+
golang.org/x/text v0.3.3 // indirect
74+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
75+
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e // indirect
76+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
77+
google.golang.org/appengine v1.6.5 // indirect
78+
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb // indirect
79+
google.golang.org/grpc v1.26.0 // indirect
80+
google.golang.org/protobuf v1.23.0 // indirect
81+
gopkg.in/fsnotify.v1 v1.4.7 // indirect
82+
gopkg.in/inf.v0 v0.9.1 // indirect
83+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
84+
gopkg.in/yaml.v2 v2.3.0 // indirect
85+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
86+
k8s.io/klog v0.4.0 // indirect
87+
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c // indirect
88+
k8s.io/utils v0.0.0-20200122174043-1e243dd1a584 // indirect
89+
sigs.k8s.io/yaml v1.1.0 // indirect
90+
)
91+
4192
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

Diff for: ‎go.sum

-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
209209
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
210210
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
211211
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
212-
github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU=
213212
github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
214213
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
215214
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=

Diff for: ‎vendor/contrib.go.opencensus.io/exporter/prometheus/go.mod

-6
This file was deleted.

Diff for: ‎vendor/contrib.go.opencensus.io/exporter/prometheus/go.sum

-51
This file was deleted.

Diff for: ‎vendor/contrib.go.opencensus.io/exporter/stackdriver/go.mod

-23
This file was deleted.

0 commit comments

Comments
 (0)