Skip to content

Commit 16cc1d1

Browse files
authored
Fix downgrade stuck (#1501)
* Fix goroutine channel leaks and ensure proper cleanup in tests Signed-off-by: Anton Troshin <[email protected]> * Add artificial delay before deleting scheduler pods during downgrade Signed-off-by: Anton Troshin <[email protected]> * Add timeout to helm upgrade tests, they are being stuck sometime for 5+ minutes Signed-off-by: Anton Troshin <[email protected]> * bump helm.sh/helm/v3 to v3.17.1 Signed-off-by: Anton Troshin <[email protected]> --------- Signed-off-by: Anton Troshin <[email protected]>
1 parent ecc4ea4 commit 16cc1d1

File tree

5 files changed

+112
-96
lines changed

5 files changed

+112
-96
lines changed

go.mod

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,27 @@ require (
2525
github.com/shirou/gopsutil v3.21.11+incompatible
2626
github.com/spf13/cobra v1.8.1
2727
github.com/spf13/viper v1.13.0
28-
github.com/stretchr/testify v1.9.0
28+
github.com/stretchr/testify v1.10.0
2929
golang.org/x/mod v0.22.0
3030
golang.org/x/sys v0.28.0
3131
gopkg.in/yaml.v2 v2.4.0
32-
helm.sh/helm/v3 v3.16.4
33-
k8s.io/api v0.31.3
34-
k8s.io/apiextensions-apiserver v0.31.3
35-
k8s.io/apimachinery v0.31.3
36-
k8s.io/cli-runtime v0.31.3
37-
k8s.io/client-go v0.31.3
32+
helm.sh/helm/v3 v3.17.1
33+
k8s.io/api v0.32.1
34+
k8s.io/apiextensions-apiserver v0.32.1
35+
k8s.io/apimachinery v0.32.1
36+
k8s.io/cli-runtime v0.32.1
37+
k8s.io/client-go v0.32.1
3838
k8s.io/helm v2.16.10+incompatible
3939
sigs.k8s.io/yaml v1.4.0
4040
)
4141

4242
require (
43+
cel.dev/expr v0.18.0 // indirect
4344
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
4445
dario.cat/mergo v1.0.1 // indirect
4546
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4647
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
47-
github.com/BurntSushi/toml v1.3.2 // indirect
48+
github.com/BurntSushi/toml v1.4.0 // indirect
4849
github.com/Code-Hex/go-generics-cache v1.3.1 // indirect
4950
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5051
github.com/Masterminds/goutils v1.1.1 // indirect
@@ -66,11 +67,11 @@ require (
6667
github.com/chebyrash/promise v0.0.0-20230709133807-42ec49ba1459 // indirect
6768
github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.14.0 // indirect
6869
github.com/cloudevents/sdk-go/v2 v2.15.2 // indirect
69-
github.com/containerd/containerd v1.7.23 // indirect
70+
github.com/containerd/containerd v1.7.24 // indirect
7071
github.com/containerd/errdefs v0.3.0 // indirect
7172
github.com/containerd/log v0.1.0 // indirect
7273
github.com/containerd/platforms v0.2.1 // indirect
73-
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
74+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
7475
github.com/dapr/components-contrib v1.15.0-rc.1.0.20241216170750-aca5116d95c9 // indirect
7576
github.com/dapr/durabletask-go v0.5.1-0.20241216172832-16da3e7c3530 // indirect
7677
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -85,7 +86,7 @@ require (
8586
github.com/docker/go-units v0.5.0 // indirect
8687
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
8788
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
88-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
89+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
8990
github.com/felixge/httpsnoop v1.0.4 // indirect
9091
github.com/fsnotify/fsnotify v1.7.0 // indirect
9192
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -99,16 +100,16 @@ require (
99100
github.com/go-logr/logr v1.4.2 // indirect
100101
github.com/go-logr/stdr v1.2.2 // indirect
101102
github.com/go-ole/go-ole v1.2.6 // indirect
102-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
103+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
103104
github.com/go-openapi/jsonreference v0.20.2 // indirect
104-
github.com/go-openapi/swag v0.22.4 // indirect
105+
github.com/go-openapi/swag v0.23.0 // indirect
105106
github.com/gobwas/glob v0.2.3 // indirect
106107
github.com/goccy/go-json v0.10.2 // indirect
107108
github.com/gogo/protobuf v1.3.2 // indirect
108109
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
109110
github.com/golang/protobuf v1.5.4 // indirect
110111
github.com/google/btree v1.1.3 // indirect
111-
github.com/google/cel-go v0.20.1 // indirect
112+
github.com/google/cel-go v0.22.0 // indirect
112113
github.com/google/gnostic-models v0.6.8 // indirect
113114
github.com/google/go-cmp v0.6.0 // indirect
114115
github.com/google/gofuzz v1.2.0 // indirect
@@ -126,7 +127,6 @@ require (
126127
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
127128
github.com/hashicorp/hcl v1.0.0 // indirect
128129
github.com/huandu/xstrings v1.5.0 // indirect
129-
github.com/imdario/mergo v0.3.16 // indirect
130130
github.com/inconshreveable/mousetrap v1.1.0 // indirect
131131
github.com/jhump/protoreflect v1.15.3 // indirect
132132
github.com/jmoiron/sqlx v1.4.0 // indirect
@@ -154,7 +154,7 @@ require (
154154
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
155155
github.com/mitchellh/reflectwalk v1.0.2 // indirect
156156
github.com/moby/locker v1.0.1 // indirect
157-
github.com/moby/spdystream v0.4.0 // indirect
157+
github.com/moby/spdystream v0.5.0 // indirect
158158
github.com/moby/term v0.5.0 // indirect
159159
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
160160
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -176,7 +176,7 @@ require (
176176
github.com/prometheus/common v0.59.1 // indirect
177177
github.com/prometheus/procfs v0.15.1 // indirect
178178
github.com/prometheus/statsd_exporter v0.22.7 // indirect
179-
github.com/rubenv/sql-migrate v1.7.0 // indirect
179+
github.com/rubenv/sql-migrate v1.7.1 // indirect
180180
github.com/russross/blackfriday/v2 v2.1.0 // indirect
181181
github.com/segmentio/asm v1.2.0 // indirect
182182
github.com/shopspring/decimal v1.4.0 // indirect
@@ -188,7 +188,7 @@ require (
188188
github.com/spf13/jwalterweatherman v1.1.0 // indirect
189189
github.com/spf13/pflag v1.0.5 // indirect
190190
github.com/spiffe/go-spiffe/v2 v2.1.7 // indirect
191-
github.com/stoewer/go-strcase v1.2.0 // indirect
191+
github.com/stoewer/go-strcase v1.3.0 // indirect
192192
github.com/subosito/gotenv v1.4.1 // indirect
193193
github.com/tidwall/transform v0.0.0-20201103190739-32f242e2dbde // indirect
194194
github.com/tklauser/go-sysconf v0.3.12 // indirect
@@ -213,7 +213,6 @@ require (
213213
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
214214
go.opentelemetry.io/otel/trace v1.32.0 // indirect
215215
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
216-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
217216
go.uber.org/multierr v1.11.0 // indirect
218217
golang.org/x/crypto v0.31.0 // indirect
219218
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
@@ -222,7 +221,7 @@ require (
222221
golang.org/x/sync v0.10.0 // indirect
223222
golang.org/x/term v0.27.0 // indirect
224223
golang.org/x/text v0.21.0 // indirect
225-
golang.org/x/time v0.6.0 // indirect
224+
golang.org/x/time v0.7.0 // indirect
226225
google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 // indirect
227226
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
228227
google.golang.org/grpc v1.68.1 // indirect
@@ -231,16 +230,16 @@ require (
231230
gopkg.in/inf.v0 v0.9.1 // indirect
232231
gopkg.in/ini.v1 v1.67.0 // indirect
233232
gopkg.in/yaml.v3 v3.0.1 // indirect
234-
k8s.io/apiserver v0.31.3 // indirect
235-
k8s.io/component-base v0.31.3 // indirect
233+
k8s.io/apiserver v0.32.1 // indirect
234+
k8s.io/component-base v0.32.1 // indirect
236235
k8s.io/klog/v2 v2.130.1 // indirect
237-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
238-
k8s.io/kubectl v0.31.3 // indirect
239-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
236+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
237+
k8s.io/kubectl v0.32.1 // indirect
238+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
240239
oras.land/oras-go v1.2.5 // indirect
241240
sigs.k8s.io/controller-runtime v0.19.0 // indirect
242-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
243-
sigs.k8s.io/kustomize/api v0.17.2 // indirect
244-
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
245-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
241+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
242+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
243+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
244+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
246245
)

0 commit comments

Comments
 (0)