Skip to content

Commit 41c07d0

Browse files
Update Go to 1.21 and deps for k8s 1.27 (#152)
Ref: rancher/rancher#43318
1 parent df30d89 commit 41c07d0

File tree

5 files changed

+349
-718
lines changed

5 files changed

+349
-718
lines changed

Diff for: Dockerfile.dapper

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19.13-alpine3.18
1+
FROM golang:1.21-alpine3.18
22

33
ARG DAPPER_HOST_ARCH
44
ENV ARCH $DAPPER_HOST_ARCH

Diff for: go.mod

+113-63
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,169 @@
11
module github.com/rancher/system-agent
22

3-
go 1.19
3+
go 1.21
4+
5+
// after a release version > 1.1.1, remove this line and update the version in the require block with the latest tag
6+
replace github.com/rancher/wrangler v1.1.1 => github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df
47

58
replace (
6-
k8s.io/api => k8s.io/api v0.24.2
7-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
8-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.2
9-
k8s.io/apiserver => k8s.io/apiserver v0.24.2
10-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
11-
k8s.io/client-go => github.com/rancher/client-go v1.24.0-rancher1
12-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.8
13-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
14-
k8s.io/code-generator => k8s.io/code-generator v0.24.0
15-
k8s.io/component-base => k8s.io/component-base v0.24.2
16-
k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
17-
k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
18-
k8s.io/cri-api => k8s.io/cri-api v0.24.0
19-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
20-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
21-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
22-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
23-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
24-
k8s.io/kubectl => k8s.io/kubectl v0.24.2
25-
k8s.io/kubelet => k8s.io/kubelet v0.24.2
26-
k8s.io/kubernetes => k8s.io/kubernetes v1.24.2
27-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
28-
k8s.io/metrics => k8s.io/metrics v0.24.0
29-
k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
30-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.8
31-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
9+
github.com/docker/cli => github.com/docker/cli v24.0.7+incompatible
10+
github.com/docker/docker => github.com/docker/docker v24.0.7+incompatible
11+
12+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
13+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0
14+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1
15+
golang.org/x/crypto => golang.org/x/crypto v0.17.0
16+
17+
k8s.io/api => k8s.io/api v0.27.10
18+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.10
19+
k8s.io/apimachinery => k8s.io/apimachinery v0.27.10
20+
k8s.io/apiserver => k8s.io/apiserver v0.27.10
21+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.10
22+
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
23+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.10
24+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.10
25+
k8s.io/code-generator => k8s.io/code-generator v0.27.10
26+
k8s.io/component-base => k8s.io/component-base v0.27.10
27+
k8s.io/component-helpers => k8s.io/component-helpers v0.27.10
28+
k8s.io/controller-manager => k8s.io/controller-manager v0.27.10
29+
k8s.io/cri-api => k8s.io/cri-api v0.27.10
30+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.10
31+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.10
32+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.10
33+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.10
34+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.10
35+
k8s.io/kubectl => k8s.io/kubectl v0.27.10
36+
k8s.io/kubelet => k8s.io/kubelet v0.27.10
37+
k8s.io/kubernetes => k8s.io/kubernetes v1.27.10
38+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.10
39+
k8s.io/metrics => k8s.io/metrics v0.27.10
40+
k8s.io/mount-utils => k8s.io/mount-utils v0.27.10
41+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.10
42+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.10
3243
)
3344

3445
require (
3546
github.com/google/go-containerregistry v0.16.1
3647
github.com/mattn/go-colorable v0.1.13
37-
github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc
48+
github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29
3849
github.com/rancher/wharfie v0.6.2
39-
github.com/rancher/wrangler v1.1.0
50+
github.com/rancher/wrangler v1.1.1
4051
github.com/sirupsen/logrus v1.9.3
4152
github.com/urfave/cli/v2 v2.25.7
42-
golang.org/x/sync v0.3.0
43-
k8s.io/api v0.25.4
44-
k8s.io/apimachinery v0.25.4
45-
k8s.io/client-go v0.25.4
46-
k8s.io/kubernetes v1.24.2
53+
golang.org/x/sync v0.5.0
54+
k8s.io/api v0.27.10
55+
k8s.io/apimachinery v0.27.10
56+
k8s.io/client-go v0.27.10
57+
k8s.io/kubernetes v1.27.10
4758
sigs.k8s.io/yaml v1.3.0
4859
)
4960

5061
require (
51-
github.com/PuerkitoBio/purell v1.1.1 // indirect
52-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
62+
github.com/NYTimes/gziphandler v1.1.1 // indirect
63+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
64+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
5365
github.com/beorn7/perks v1.0.1 // indirect
5466
github.com/blang/semver/v4 v4.0.0 // indirect
55-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
67+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
68+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5669
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
70+
github.com/coreos/go-semver v0.3.0 // indirect
71+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
5772
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
5873
github.com/davecgh/go-spew v1.1.1 // indirect
5974
github.com/docker/cli v24.0.0+incompatible // indirect
6075
github.com/docker/distribution v2.8.2+incompatible // indirect
6176
github.com/docker/docker v24.0.0+incompatible // indirect
6277
github.com/docker/docker-credential-helpers v0.7.0 // indirect
63-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
78+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
6479
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
65-
github.com/go-logr/logr v1.2.3 // indirect
66-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
67-
github.com/go-openapi/jsonreference v0.19.5 // indirect
68-
github.com/go-openapi/swag v0.19.14 // indirect
80+
github.com/felixge/httpsnoop v1.0.4 // indirect
81+
github.com/fsnotify/fsnotify v1.6.0 // indirect
82+
github.com/go-logr/logr v1.4.1 // indirect
83+
github.com/go-logr/stdr v1.2.2 // indirect
84+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
85+
github.com/go-openapi/jsonreference v0.20.1 // indirect
86+
github.com/go-openapi/swag v0.22.3 // indirect
6987
github.com/gogo/protobuf v1.3.2 // indirect
88+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7089
github.com/golang/protobuf v1.5.3 // indirect
90+
github.com/google/cel-go v0.12.7 // indirect
7191
github.com/google/gnostic v0.5.7-v3refs // indirect
72-
github.com/google/go-cmp v0.5.9 // indirect
92+
github.com/google/go-cmp v0.6.0 // indirect
7393
github.com/google/gofuzz v1.2.0 // indirect
94+
github.com/google/uuid v1.4.0 // indirect
95+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
96+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
7497
github.com/imdario/mergo v0.3.12 // indirect
98+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7599
github.com/josharian/intern v1.0.0 // indirect
76100
github.com/json-iterator/go v1.1.12 // indirect
77101
github.com/klauspost/compress v1.16.5 // indirect
78-
github.com/mailru/easyjson v0.7.6 // indirect
102+
github.com/mailru/easyjson v0.7.7 // indirect
79103
github.com/mattn/go-isatty v0.0.16 // indirect
80-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
104+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
81105
github.com/mitchellh/go-homedir v1.1.0 // indirect
106+
github.com/mitchellh/mapstructure v1.4.1 // indirect
82107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
83108
github.com/modern-go/reflect2 v1.0.2 // indirect
84109
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
85110
github.com/opencontainers/go-digest v1.0.0 // indirect
86111
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
87112
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
88113
github.com/pkg/errors v0.9.1 // indirect
89-
github.com/prometheus/client_golang v1.12.1 // indirect
90-
github.com/prometheus/client_model v0.2.0 // indirect
91-
github.com/prometheus/common v0.32.1 // indirect
92-
github.com/prometheus/procfs v0.7.3 // indirect
114+
github.com/prometheus/client_golang v1.14.0 // indirect
115+
github.com/prometheus/client_model v0.3.0 // indirect
116+
github.com/prometheus/common v0.37.0 // indirect
117+
github.com/prometheus/procfs v0.8.0 // indirect
93118
github.com/russross/blackfriday/v2 v2.1.0 // indirect
119+
github.com/spf13/cobra v1.7.0 // indirect
94120
github.com/spf13/pflag v1.0.5 // indirect
121+
github.com/stoewer/go-strcase v1.2.0 // indirect
95122
github.com/urfave/cli v1.22.12 // indirect
96123
github.com/vbatts/tar-split v0.11.3 // indirect
97124
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
125+
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
126+
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
127+
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
128+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
129+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
130+
go.opentelemetry.io/otel v1.23.1 // indirect
131+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
133+
go.opentelemetry.io/otel/metric v1.23.1 // indirect
134+
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
135+
go.opentelemetry.io/otel/trace v1.23.1 // indirect
136+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
98137
go.uber.org/atomic v1.7.0 // indirect
99138
go.uber.org/multierr v1.6.0 // indirect
100-
golang.org/x/net v0.10.0 // indirect
101-
golang.org/x/oauth2 v0.8.0 // indirect
102-
golang.org/x/sys v0.8.0 // indirect
103-
golang.org/x/term v0.8.0 // indirect
104-
golang.org/x/text v0.9.0 // indirect
105-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
106-
google.golang.org/appengine v1.6.7 // indirect
107-
google.golang.org/protobuf v1.30.0 // indirect
139+
go.uber.org/zap v1.19.0 // indirect
140+
golang.org/x/crypto v0.16.0 // indirect
141+
golang.org/x/net v0.19.0 // indirect
142+
golang.org/x/oauth2 v0.15.0 // indirect
143+
golang.org/x/sys v0.16.0 // indirect
144+
golang.org/x/term v0.15.0 // indirect
145+
golang.org/x/text v0.14.0 // indirect
146+
golang.org/x/time v0.3.0 // indirect
147+
google.golang.org/appengine v1.6.8 // indirect
148+
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
149+
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
150+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
151+
google.golang.org/grpc v1.61.0 // indirect
152+
google.golang.org/protobuf v1.32.0 // indirect
108153
gopkg.in/inf.v0 v0.9.1 // indirect
154+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
109155
gopkg.in/yaml.v2 v2.4.0 // indirect
110156
gopkg.in/yaml.v3 v3.0.1 // indirect
111-
k8s.io/apiserver v0.24.0 // indirect
112-
k8s.io/component-base v0.24.2 // indirect
113-
k8s.io/klog/v2 v2.80.1 // indirect
114-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
157+
k8s.io/apiserver v0.27.10 // indirect
158+
k8s.io/cloud-provider v0.0.0 // indirect
159+
k8s.io/component-base v0.27.10 // indirect
160+
k8s.io/controller-manager v0.27.10 // indirect
161+
k8s.io/klog/v2 v2.90.1 // indirect
162+
k8s.io/kms v0.27.10 // indirect
163+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
115164
k8s.io/kubelet v0.24.2 // indirect
116-
k8s.io/utils v0.0.0-20221011040102-427025108f67 // indirect
117-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
165+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
166+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
167+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
118168
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
119169
)

0 commit comments

Comments
 (0)