Skip to content

Commit 8e5485b

Browse files
jiaqiluojiaqiluo
authored
Merge pull request #334 from jiaqiluo/bump-k8s
2 parents f7f79ff + c303e94 commit 8e5485b

File tree

6 files changed

+211
-205
lines changed

6 files changed

+211
-205
lines changed

‎Dockerfile.dapper

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG KUBECTL=rancher/kubectl:v1.30.3
1+
ARG KUBECTL=rancher/kubectl:v1.31.1
22
FROM ${KUBECTL} AS kubectl
33

4-
FROM registry.suse.com/bci/golang:1.22
4+
FROM registry.suse.com/bci/golang:1.23
55

66
COPY --from=kubectl /bin/kubectl /usr/local/bin/kubectl
77

@@ -10,7 +10,7 @@ ENV ARCH $DAPPER_HOST_ARCH
1010
ARG SONOBUOY_VERSION=0.57.1
1111
RUN zypper -n install expect git jq docker vim less file curl wget iproute2 gawk
1212
RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \
13-
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.1; \
13+
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.61.0; \
1414
curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.4.3/kustomize_v5.4.3_linux_amd64.tar.gz" | tar -xz -C /usr/local/bin; \
1515
curl -sL "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_${ARCH}.tar.gz" | tar -xz -C /usr/local/bin; \
1616
curl -sL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose && \

‎go.mod

+49-49
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/rancher/system-upgrade-controller
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.6
5+
toolchain go1.23.2
66

77
require (
88
github.com/docker/distribution v2.8.3+incompatible
@@ -13,124 +13,124 @@ require (
1313
github.com/rancher/wrangler/v3 v3.0.0
1414
github.com/sirupsen/logrus v1.9.3
1515
github.com/urfave/cli v1.22.15
16-
k8s.io/api v0.30.3
17-
k8s.io/apimachinery v0.30.3
18-
k8s.io/client-go v0.30.3
19-
k8s.io/kubectl v0.30.3
20-
k8s.io/kubernetes v1.30.3
21-
k8s.io/pod-security-admission v0.30.3
16+
k8s.io/api v0.31.1
17+
k8s.io/apimachinery v0.31.1
18+
k8s.io/client-go v0.31.1
19+
k8s.io/kubectl v0.31.1
20+
k8s.io/kubernetes v1.31.1
21+
k8s.io/pod-security-admission v0.31.1
2222
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2323
)
2424

2525
require (
2626
github.com/NYTimes/gziphandler v1.1.1 // indirect
27-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
27+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2828
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
31-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
32-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
31+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
32+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3333
github.com/coreos/go-semver v0.3.1 // indirect
3434
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3535
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
36-
github.com/davecgh/go-spew v1.1.1 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3737
github.com/distribution/reference v0.5.0 // indirect
3838
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3939
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
40-
github.com/felixge/httpsnoop v1.0.3 // indirect
40+
github.com/felixge/httpsnoop v1.0.4 // indirect
4141
github.com/fsnotify/fsnotify v1.7.0 // indirect
42+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4243
github.com/ghodss/yaml v1.0.0 // indirect
4344
github.com/go-logr/logr v1.4.2 // indirect
4445
github.com/go-logr/stdr v1.2.2 // indirect
4546
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4647
github.com/go-openapi/jsonreference v0.20.2 // indirect
47-
github.com/go-openapi/swag v0.22.3 // indirect
48+
github.com/go-openapi/swag v0.22.4 // indirect
4849
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4950
github.com/gogo/protobuf v1.3.2 // indirect
5051
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5152
github.com/golang/protobuf v1.5.4 // indirect
52-
github.com/google/cel-go v0.17.8 // indirect
53+
github.com/google/cel-go v0.20.1 // indirect
5354
github.com/google/gnostic-models v0.6.8 // indirect
5455
github.com/google/go-cmp v0.6.0 // indirect
5556
github.com/google/gofuzz v1.2.0 // indirect
5657
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
5758
github.com/google/uuid v1.6.0 // indirect
5859
github.com/gorilla/websocket v1.5.0 // indirect
5960
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
60-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
61+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
6162
github.com/imdario/mergo v0.3.12 // indirect
6263
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6364
github.com/josharian/intern v1.0.0 // indirect
6465
github.com/json-iterator/go v1.1.12 // indirect
6566
github.com/mailru/easyjson v0.7.7 // indirect
66-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
67-
github.com/moby/spdystream v0.2.0 // indirect
67+
github.com/moby/spdystream v0.4.0 // indirect
6868
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6969
github.com/modern-go/reflect2 v1.0.2 // indirect
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7171
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7272
github.com/opencontainers/go-digest v1.0.0 // indirect
7373
github.com/pkg/errors v0.9.1 // indirect
74-
github.com/prometheus/client_golang v1.16.0 // indirect
75-
github.com/prometheus/client_model v0.4.0 // indirect
76-
github.com/prometheus/common v0.44.0 // indirect
77-
github.com/prometheus/procfs v0.10.1 // indirect
74+
github.com/prometheus/client_golang v1.19.1 // indirect
75+
github.com/prometheus/client_model v0.6.1 // indirect
76+
github.com/prometheus/common v0.55.0 // indirect
77+
github.com/prometheus/procfs v0.15.1 // indirect
7878
github.com/russross/blackfriday/v2 v2.1.0 // indirect
79-
github.com/spf13/cobra v1.7.0 // indirect
79+
github.com/spf13/cobra v1.8.1 // indirect
8080
github.com/spf13/pflag v1.0.5 // indirect
8181
github.com/stoewer/go-strcase v1.2.0 // indirect
82-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
83-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
84-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
85-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
86-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
87-
go.opentelemetry.io/otel v1.19.0 // indirect
88-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
89-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
90-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
91-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
92-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
93-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
82+
github.com/x448/float16 v0.8.4 // indirect
83+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
84+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
85+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
86+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
87+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
88+
go.opentelemetry.io/otel v1.28.0 // indirect
89+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
90+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
91+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
92+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
93+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
94+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
9495
go.uber.org/multierr v1.11.0 // indirect
9596
go.uber.org/zap v1.26.0 // indirect
9697
golang.org/x/crypto v0.26.0 // indirect
9798
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
9899
golang.org/x/mod v0.20.0 // indirect
99100
golang.org/x/net v0.28.0 // indirect
100-
golang.org/x/oauth2 v0.16.0 // indirect
101+
golang.org/x/oauth2 v0.21.0 // indirect
101102
golang.org/x/sync v0.8.0 // indirect
102103
golang.org/x/sys v0.23.0 // indirect
103104
golang.org/x/term v0.23.0 // indirect
104105
golang.org/x/text v0.17.0 // indirect
105106
golang.org/x/time v0.3.0 // indirect
106107
golang.org/x/tools v0.24.0 // indirect
107-
google.golang.org/appengine v1.6.7 // indirect
108-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
109-
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
110-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
111-
google.golang.org/grpc v1.58.3 // indirect
112-
google.golang.org/protobuf v1.34.1 // indirect
108+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
109+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
110+
google.golang.org/grpc v1.65.0 // indirect
111+
google.golang.org/protobuf v1.34.2 // indirect
112+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
113113
gopkg.in/inf.v0 v0.9.1 // indirect
114114
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
115115
gopkg.in/yaml.v2 v2.4.0 // indirect
116116
gopkg.in/yaml.v3 v3.0.1 // indirect
117117
k8s.io/apiextensions-apiserver v0.30.3 // indirect
118-
k8s.io/apiserver v0.30.3 // indirect
118+
k8s.io/apiserver v0.31.1 // indirect
119119
k8s.io/cloud-provider v0.30.3 // indirect
120120
k8s.io/code-generator v0.30.3 // indirect
121-
k8s.io/component-base v0.30.3 // indirect
122-
k8s.io/component-helpers v0.30.3 // indirect
121+
k8s.io/component-base v0.31.1 // indirect
122+
k8s.io/component-helpers v0.31.1 // indirect
123123
k8s.io/controller-manager v0.30.3 // indirect
124124
k8s.io/gengo v0.0.0-20240228010128-51d4e06bde70 // indirect
125125
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
126-
k8s.io/klog/v2 v2.120.1 // indirect
127-
k8s.io/kms v0.30.3 // indirect
126+
k8s.io/klog/v2 v2.130.1 // indirect
127+
k8s.io/kms v0.31.1 // indirect
128128
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
129129
k8s.io/kubelet v0.25.12 // indirect
130-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
130+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
131131
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
132132
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
133-
sigs.k8s.io/yaml v1.3.0 // indirect
133+
sigs.k8s.io/yaml v1.4.0 // indirect
134134
)
135135

136136
replace github.com/rancher/system-upgrade-controller/pkg/apis => ./pkg/apis

0 commit comments

Comments
 (0)