Skip to content

Commit fa386cd

Browse files
swastik959swastik959
committed
added k8s-1.33-support
Signed-off-by: swastik959 <Sswastik959@gmail.com>
1 parent eed8667 commit fa386cd

File tree

12 files changed

+346
-725
lines changed

12 files changed

+346
-725
lines changed

‎Dockerfile.dapper

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ARG KUBECTL=rancher/kubectl:v1.32.2
1+
ARG KUBECTL=rancher/kubectl:v1.33.1
22
FROM ${KUBECTL} AS kubectl
33

4-
FROM registry.suse.com/bci/golang:1.23
4+
FROM registry.suse.com/bci/golang:1.24
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.61.0; \
13+
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.2; \
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

Lines changed: 97 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,111 @@
11
module github.com/rancher/system-upgrade-controller
22

3-
go 1.23.0
3+
go 1.24.0
44

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

77
replace (
88
github.com/distribution/reference => github.com/distribution/reference v0.5.0
99
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
10+
k8s.io/api => k8s.io/api v0.33.1
11+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.1
12+
k8s.io/apimachinery => k8s.io/apimachinery v0.33.1
13+
k8s.io/apiserver => k8s.io/apiserver v0.33.1
14+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.1
15+
k8s.io/client-go => k8s.io/client-go v0.33.1
16+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.1
17+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.1
18+
k8s.io/code-generator => k8s.io/code-generator v0.33.1
19+
k8s.io/component-base => k8s.io/component-base v0.33.1
20+
k8s.io/component-helpers => k8s.io/component-helpers v0.33.1
21+
k8s.io/controller-manager => k8s.io/controller-manager v0.33.1
22+
k8s.io/cri-api => k8s.io/cri-api v0.33.1
23+
k8s.io/cri-client => k8s.io/cri-client v0.33.1
24+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.1
25+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.1
26+
k8s.io/endpointslice => k8s.io/endpointslice v0.33.1
27+
k8s.io/externaljwt => k8s.io/externaljwt v0.33.1
28+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.1
29+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.1
30+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.1
31+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.1
32+
k8s.io/kubectl => k8s.io/kubectl v0.33.1
33+
k8s.io/kubelet => k8s.io/kubelet v0.33.1
34+
k8s.io/kubernetes => k8s.io/kubernetes v1.33.1
35+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.1
36+
k8s.io/metrics => k8s.io/metrics v0.33.1
37+
k8s.io/mount-utils => k8s.io/mount-utils v0.33.1
38+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.1
39+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.1
4040
)
4141

4242
require (
4343
github.com/docker/distribution v2.8.3+incompatible
4444
github.com/kubereboot/kured v1.13.1
4545
github.com/onsi/ginkgo/v2 v2.21.0
4646
github.com/onsi/gomega v1.35.1
47-
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813
47+
github.com/rancher/lasso v0.2.3-rc3
4848
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0
49-
github.com/rancher/wrangler/v3 v3.1.0
49+
github.com/rancher/wrangler/v3 v3.2.2-rc.3
5050
github.com/sirupsen/logrus v1.9.3
5151
github.com/urfave/cli v1.22.15
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
52+
k8s.io/api v0.33.1
53+
k8s.io/apimachinery v0.33.1
54+
k8s.io/client-go v0.33.1
55+
k8s.io/kubectl v0.33.1
56+
k8s.io/kubernetes v1.33.1
57+
k8s.io/pod-security-admission v0.33.1
5858
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
5959
)
6060

6161
require (
62-
cel.dev/expr v0.18.0 // indirect
62+
cel.dev/expr v0.19.1 // indirect
6363
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
6464
github.com/Microsoft/go-winio v0.6.2 // indirect
65-
github.com/NYTimes/gziphandler v1.1.1 // indirect
6665
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
67-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
6866
github.com/beorn7/perks v1.0.1 // indirect
6967
github.com/blang/semver/v4 v4.0.0 // indirect
7068
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7169
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
70+
github.com/containerd/containerd/api v1.8.0 // indirect
71+
github.com/containerd/errdefs v1.0.0 // indirect
72+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
7473
github.com/containerd/log v0.1.0 // indirect
75-
github.com/containerd/ttrpc v1.2.5 // indirect
76-
github.com/coreos/go-semver v0.3.1 // indirect
74+
github.com/containerd/ttrpc v1.2.6 // indirect
75+
github.com/containerd/typeurl/v2 v2.2.2 // indirect
7776
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7877
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
79-
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
78+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
8079
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8180
github.com/distribution/reference v0.6.0 // indirect
8281
github.com/docker/go-units v0.5.0 // indirect
83-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
82+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
8483
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
85-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
84+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
8685
github.com/felixge/httpsnoop v1.0.4 // indirect
8786
github.com/fsnotify/fsnotify v1.7.0 // indirect
8887
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8988
github.com/ghodss/yaml v1.0.0 // indirect
9089
github.com/go-logr/logr v1.4.2 // indirect
9190
github.com/go-logr/stdr v1.2.2 // indirect
9291
github.com/go-openapi/jsonpointer v0.21.0 // indirect
93-
github.com/go-openapi/jsonreference v0.20.2 // indirect
92+
github.com/go-openapi/jsonreference v0.21.0 // indirect
9493
github.com/go-openapi/swag v0.23.0 // indirect
9594
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9695
github.com/godbus/dbus/v5 v5.1.0 // indirect
9796
github.com/gogo/protobuf v1.3.2 // indirect
98-
github.com/golang/protobuf v1.5.4 // 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
102-
github.com/google/gnostic-models v0.6.8 // indirect
103-
github.com/google/go-cmp v0.6.0 // indirect
104-
github.com/google/gofuzz v1.2.0 // indirect
97+
github.com/google/cadvisor v0.52.1 // indirect
98+
github.com/google/cel-go v0.23.2 // indirect
99+
github.com/google/gnostic-models v0.6.9 // indirect
100+
github.com/google/go-cmp v0.7.0 // indirect
105101
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
106102
github.com/google/uuid v1.6.0 // indirect
107-
github.com/gorilla/websocket v1.5.0 // indirect
108-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
109-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
103+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
104+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
110105
github.com/inconshreveable/mousetrap v1.1.0 // indirect
111106
github.com/josharian/intern v1.0.0 // indirect
112107
github.com/json-iterator/go v1.1.12 // indirect
113108
github.com/karrick/godirwalk v1.17.0 // indirect
114-
github.com/klauspost/compress v1.17.9 // indirect
115-
github.com/kylelemons/godebug v1.1.0 // indirect
116109
github.com/mailru/easyjson v0.7.7 // indirect
117110
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
118111
github.com/moby/spdystream v0.5.0 // indirect
@@ -122,75 +115,70 @@ require (
122115
github.com/modern-go/reflect2 v1.0.2 // indirect
123116
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
124117
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
118+
github.com/opencontainers/cgroups v0.0.1 // indirect
125119
github.com/opencontainers/go-digest v1.0.0 // indirect
126-
github.com/opencontainers/runc v1.2.1 // indirect
120+
github.com/opencontainers/image-spec v1.1.1 // indirect
127121
github.com/opencontainers/runtime-spec v1.2.0 // indirect
128122
github.com/opencontainers/selinux v1.11.1 // indirect
129123
github.com/pkg/errors v0.9.1 // indirect
130-
github.com/prometheus/client_golang v1.20.5 // indirect
124+
github.com/prometheus/client_golang v1.22.0 // indirect
131125
github.com/prometheus/client_model v0.6.1 // indirect
132-
github.com/prometheus/common v0.60.0 // indirect
126+
github.com/prometheus/common v0.62.0 // indirect
133127
github.com/prometheus/procfs v0.15.1 // indirect
134128
github.com/russross/blackfriday/v2 v2.1.0 // indirect
135129
github.com/spf13/cobra v1.8.1 // indirect
136130
github.com/spf13/pflag v1.0.5 // indirect
137131
github.com/stoewer/go-strcase v1.3.0 // indirect
138132
github.com/x448/float16 v0.8.4 // 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
142-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
143-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
144-
go.opentelemetry.io/otel v1.28.0 // indirect
145-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
146-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
147-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
148-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
149-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
150-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
151-
go.uber.org/multierr v1.11.0 // indirect
152-
go.uber.org/zap v1.27.0 // indirect
153-
golang.org/x/crypto v0.35.0 // indirect
133+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
134+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
135+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
136+
go.opentelemetry.io/otel v1.33.0 // indirect
137+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
138+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
139+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
140+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
141+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
142+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
154143
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
155-
golang.org/x/mod v0.21.0 // indirect
156-
golang.org/x/net v0.30.0 // indirect
157-
golang.org/x/oauth2 v0.23.0 // indirect
158-
golang.org/x/sync v0.11.0 // indirect
159-
golang.org/x/sys v0.30.0 // indirect
160-
golang.org/x/term v0.29.0 // indirect
161-
golang.org/x/text v0.22.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
166-
google.golang.org/grpc v1.65.0 // indirect
167-
google.golang.org/protobuf v1.35.1 // indirect
144+
golang.org/x/mod v0.23.0 // indirect
145+
golang.org/x/net v0.38.0 // indirect
146+
golang.org/x/oauth2 v0.27.0 // indirect
147+
golang.org/x/sync v0.12.0 // indirect
148+
golang.org/x/sys v0.31.0 // indirect
149+
golang.org/x/term v0.30.0 // indirect
150+
golang.org/x/text v0.23.0 // indirect
151+
golang.org/x/time v0.9.0 // indirect
152+
golang.org/x/tools v0.30.0 // indirect
153+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
154+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
155+
google.golang.org/grpc v1.68.1 // indirect
156+
google.golang.org/protobuf v1.36.5 // indirect
168157
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
169158
gopkg.in/inf.v0 v0.9.1 // indirect
170-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
171159
gopkg.in/yaml.v2 v2.4.0 // indirect
172160
gopkg.in/yaml.v3 v3.0.1 // indirect
173-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
174-
k8s.io/apiserver v0.32.2 // indirect
161+
k8s.io/apiextensions-apiserver v0.33.1 // indirect
162+
k8s.io/apiserver v0.33.1 // indirect
175163
k8s.io/cloud-provider v0.30.3 // 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
164+
k8s.io/code-generator v0.33.1 // indirect
165+
k8s.io/component-base v0.33.1 // indirect
166+
k8s.io/component-helpers v0.33.1 // indirect
167+
k8s.io/controller-manager v0.33.1 // indirect
168+
k8s.io/cri-api v0.33.1 // indirect
181169
k8s.io/cri-client v0.0.0 // indirect
182170
k8s.io/csi-translation-lib v0.0.0 // indirect
183171
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
172+
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 // indirect
173+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
186174
k8s.io/klog/v2 v2.130.1 // indirect
187-
k8s.io/kms v0.32.2 // indirect
188-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
175+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
189176
k8s.io/kube-scheduler v0.0.0 // indirect
190-
k8s.io/kubelet v0.32.2 // indirect
177+
k8s.io/kubelet v0.33.1 // indirect
191178
k8s.io/mount-utils v0.0.0 // indirect
192-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
179+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
193180
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
194-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
181+
sigs.k8s.io/randfill v1.0.0 // indirect
182+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
195183
sigs.k8s.io/yaml v1.4.0 // indirect
196184
)

0 commit comments

Comments
 (0)