Skip to content

Commit 2cf5761

Browse files
committed
support k8s 1.32.2
1 parent acc2fdf commit 2cf5761

File tree

5 files changed

+426
-207
lines changed

5 files changed

+426
-207
lines changed

Dockerfile.dapper

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

44
FROM registry.suse.com/bci/golang:1.23

go.mod

+110-53
Original file line numberDiff line numberDiff line change
@@ -4,75 +4,128 @@ go 1.23.0
44

55
toolchain go1.23.2
66

7+
replace (
8+
github.com/distribution/reference => github.com/distribution/reference v0.5.0
9+
github.com/rancher/system-upgrade-controller/pkg/apis => ./pkg/apis
10+
k8s.io/api => k8s.io/api v0.32.2
11+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
12+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.2
13+
k8s.io/apiserver => k8s.io/apiserver v0.32.2
14+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2
15+
k8s.io/client-go => k8s.io/client-go v0.32.2
16+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.2
17+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.2
18+
k8s.io/code-generator => k8s.io/code-generator v0.32.2
19+
k8s.io/component-base => k8s.io/component-base v0.32.2
20+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.2
21+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.2
22+
k8s.io/cri-api => k8s.io/cri-api v0.32.2
23+
k8s.io/cri-client => k8s.io/cri-client v0.32.2
24+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
25+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2
26+
k8s.io/endpointslice => k8s.io/endpointslice v0.32.2
27+
k8s.io/externaljwt => k8s.io/externaljwt v0.32.2
28+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.2
29+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.2
30+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.2
31+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
32+
k8s.io/kubectl => k8s.io/kubectl v0.32.2
33+
k8s.io/kubelet => k8s.io/kubelet v0.32.2
34+
k8s.io/kubernetes => k8s.io/kubernetes v1.32.2
35+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.2
36+
k8s.io/metrics => k8s.io/metrics v0.32.2
37+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.2
38+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2
39+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2
40+
)
41+
742
require (
843
github.com/docker/distribution v2.8.3+incompatible
9-
github.com/kubereboot/kured v0.0.0-20241022191328-c77090d5fdd3
10-
github.com/onsi/ginkgo/v2 v2.20.0
11-
github.com/onsi/gomega v1.34.1
12-
github.com/rancher/lasso v0.0.0-20240805175815-a40054127062
44+
github.com/kubereboot/kured v1.13.1
45+
github.com/onsi/ginkgo/v2 v2.21.0
46+
github.com/onsi/gomega v1.35.1
47+
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813
1348
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0
14-
github.com/rancher/wrangler/v3 v3.0.0
49+
github.com/rancher/wrangler/v3 v3.1.0
1550
github.com/sirupsen/logrus v1.9.3
1651
github.com/urfave/cli v1.22.15
17-
k8s.io/api v0.31.1
18-
k8s.io/apimachinery v0.31.1
19-
k8s.io/client-go v0.31.1
20-
k8s.io/kubectl v0.31.1
21-
k8s.io/kubernetes v1.31.1
22-
k8s.io/pod-security-admission v0.31.1
23-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
52+
k8s.io/api v0.32.2
53+
k8s.io/apimachinery v0.32.2
54+
k8s.io/client-go v0.32.2
55+
k8s.io/kubectl v0.32.2
56+
k8s.io/kubernetes v1.32.2
57+
k8s.io/pod-security-admission v0.32.2
58+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2459
)
2560

2661
require (
62+
cel.dev/expr v0.18.0 // indirect
63+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
64+
github.com/Microsoft/go-winio v0.6.2 // indirect
2765
github.com/NYTimes/gziphandler v1.1.1 // indirect
2866
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2967
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3068
github.com/beorn7/perks v1.0.1 // indirect
3169
github.com/blang/semver/v4 v4.0.0 // indirect
3270
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3371
github.com/cespare/xxhash/v2 v2.3.0 // indirect
72+
github.com/containerd/containerd/api v1.7.19 // indirect
73+
github.com/containerd/errdefs v0.1.0 // indirect
74+
github.com/containerd/log v0.1.0 // indirect
75+
github.com/containerd/ttrpc v1.2.5 // indirect
3476
github.com/coreos/go-semver v0.3.1 // indirect
3577
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3678
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
79+
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
3780
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
38-
github.com/distribution/reference v0.5.0 // indirect
81+
github.com/distribution/reference v0.6.0 // indirect
82+
github.com/docker/go-units v0.5.0 // indirect
3983
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
40-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
84+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
85+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
4186
github.com/felixge/httpsnoop v1.0.4 // indirect
4287
github.com/fsnotify/fsnotify v1.7.0 // indirect
4388
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4489
github.com/ghodss/yaml v1.0.0 // indirect
4590
github.com/go-logr/logr v1.4.2 // indirect
4691
github.com/go-logr/stdr v1.2.2 // indirect
47-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
92+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4893
github.com/go-openapi/jsonreference v0.20.2 // indirect
49-
github.com/go-openapi/swag v0.22.4 // indirect
94+
github.com/go-openapi/swag v0.23.0 // indirect
5095
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
96+
github.com/godbus/dbus/v5 v5.1.0 // indirect
5197
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5398
github.com/golang/protobuf v1.5.4 // indirect
54-
github.com/google/cel-go v0.20.1 // indirect
99+
github.com/google/btree v1.0.1 // indirect
100+
github.com/google/cadvisor v0.51.0 // indirect
101+
github.com/google/cel-go v0.22.0 // indirect
55102
github.com/google/gnostic-models v0.6.8 // indirect
56103
github.com/google/go-cmp v0.6.0 // indirect
57104
github.com/google/gofuzz v1.2.0 // indirect
58-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
105+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
59106
github.com/google/uuid v1.6.0 // indirect
60107
github.com/gorilla/websocket v1.5.0 // indirect
61108
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
62109
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
63-
github.com/imdario/mergo v0.3.12 // indirect
64110
github.com/inconshreveable/mousetrap v1.1.0 // indirect
65111
github.com/josharian/intern v1.0.0 // indirect
66112
github.com/json-iterator/go v1.1.12 // indirect
113+
github.com/karrick/godirwalk v1.17.0 // indirect
67114
github.com/klauspost/compress v1.17.9 // indirect
68115
github.com/kylelemons/godebug v1.1.0 // indirect
69116
github.com/mailru/easyjson v0.7.7 // indirect
70-
github.com/moby/spdystream v0.4.0 // indirect
117+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
118+
github.com/moby/spdystream v0.5.0 // indirect
119+
github.com/moby/sys/mountinfo v0.7.2 // indirect
120+
github.com/moby/sys/userns v0.1.0 // indirect
71121
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
72122
github.com/modern-go/reflect2 v1.0.2 // indirect
73123
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
74124
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
75125
github.com/opencontainers/go-digest v1.0.0 // indirect
126+
github.com/opencontainers/runc v1.2.1 // indirect
127+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
128+
github.com/opencontainers/selinux v1.11.1 // indirect
76129
github.com/pkg/errors v0.9.1 // indirect
77130
github.com/prometheus/client_golang v1.20.5 // indirect
78131
github.com/prometheus/client_model v0.6.1 // indirect
@@ -81,11 +134,11 @@ require (
81134
github.com/russross/blackfriday/v2 v2.1.0 // indirect
82135
github.com/spf13/cobra v1.8.1 // indirect
83136
github.com/spf13/pflag v1.0.5 // indirect
84-
github.com/stoewer/go-strcase v1.2.0 // indirect
137+
github.com/stoewer/go-strcase v1.3.0 // indirect
85138
github.com/x448/float16 v0.8.4 // indirect
86-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
87-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
88-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
139+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
140+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
141+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
89142
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
90143
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
91144
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -96,44 +149,48 @@ require (
96149
go.opentelemetry.io/otel/trace v1.28.0 // indirect
97150
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
98151
go.uber.org/multierr v1.11.0 // indirect
99-
go.uber.org/zap v1.26.0 // indirect
100-
golang.org/x/crypto v0.27.0 // indirect
152+
go.uber.org/zap v1.27.0 // indirect
153+
golang.org/x/crypto v0.28.0 // indirect
101154
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
102-
golang.org/x/mod v0.20.0 // indirect
103-
golang.org/x/net v0.29.0 // indirect
155+
golang.org/x/mod v0.21.0 // indirect
156+
golang.org/x/net v0.30.0 // indirect
104157
golang.org/x/oauth2 v0.23.0 // indirect
105158
golang.org/x/sync v0.8.0 // indirect
106-
golang.org/x/sys v0.25.0 // indirect
107-
golang.org/x/term v0.24.0 // indirect
108-
golang.org/x/text v0.18.0 // indirect
109-
golang.org/x/time v0.5.0 // indirect
110-
golang.org/x/tools v0.24.0 // indirect
111-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
112-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
159+
golang.org/x/sys v0.26.0 // indirect
160+
golang.org/x/term v0.25.0 // indirect
161+
golang.org/x/text v0.19.0 // indirect
162+
golang.org/x/time v0.7.0 // indirect
163+
golang.org/x/tools v0.26.0 // indirect
164+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
165+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
113166
google.golang.org/grpc v1.65.0 // indirect
114-
google.golang.org/protobuf v1.34.2 // indirect
167+
google.golang.org/protobuf v1.35.1 // indirect
115168
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
116169
gopkg.in/inf.v0 v0.9.1 // indirect
117170
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
118171
gopkg.in/yaml.v2 v2.4.0 // indirect
119172
gopkg.in/yaml.v3 v3.0.1 // indirect
120-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
121-
k8s.io/apiserver v0.31.1 // indirect
173+
k8s.io/apiextensions-apiserver v0.31.1 // indirect
174+
k8s.io/apiserver v0.32.2 // indirect
122175
k8s.io/cloud-provider v0.30.3 // indirect
123-
k8s.io/code-generator v0.30.3 // indirect
124-
k8s.io/component-base v0.31.1 // indirect
125-
k8s.io/component-helpers v0.31.1 // indirect
126-
k8s.io/controller-manager v0.30.3 // indirect
127-
k8s.io/gengo v0.0.0-20240228010128-51d4e06bde70 // indirect
128-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
176+
k8s.io/code-generator v0.32.2 // indirect
177+
k8s.io/component-base v0.32.2 // indirect
178+
k8s.io/component-helpers v0.32.2 // indirect
179+
k8s.io/controller-manager v0.32.2 // indirect
180+
k8s.io/cri-api v0.32.2 // indirect
181+
k8s.io/cri-client v0.0.0 // indirect
182+
k8s.io/csi-translation-lib v0.0.0 // indirect
183+
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
184+
k8s.io/gengo v0.0.0-20240826214909-a7b603a56eb7 // indirect
185+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
129186
k8s.io/klog/v2 v2.130.1 // indirect
130-
k8s.io/kms v0.31.1 // indirect
131-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
132-
k8s.io/kubelet v0.25.12 // indirect
133-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
134-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
135-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
187+
k8s.io/kms v0.32.2 // indirect
188+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
189+
k8s.io/kube-scheduler v0.0.0 // indirect
190+
k8s.io/kubelet v0.32.2 // indirect
191+
k8s.io/mount-utils v0.0.0 // indirect
192+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
193+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
194+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
136195
sigs.k8s.io/yaml v1.4.0 // indirect
137196
)
138-
139-
replace github.com/rancher/system-upgrade-controller/pkg/apis => ./pkg/apis

0 commit comments

Comments
 (0)