Skip to content

Commit 3d282b9

Browse files
committed
refactor: improve HelmRepository controller test structure for runtime/secrets migration
Signed-off-by: cappyzawa <[email protected]>
1 parent 21e3a02 commit 3d282b9

File tree

3 files changed

+308
-183
lines changed

3 files changed

+308
-183
lines changed

go.mod

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ require (
2525
github.com/docker/cli v28.1.1+incompatible
2626
github.com/docker/go-units v0.5.0
2727
github.com/elazarl/goproxy v1.7.2
28-
github.com/fluxcd/cli-utils v0.36.0-flux.13
29-
github.com/fluxcd/pkg/apis/event v0.17.0
30-
github.com/fluxcd/pkg/apis/meta v1.12.0
28+
github.com/fluxcd/cli-utils v0.36.0-flux.14
29+
github.com/fluxcd/pkg/apis/event v0.18.0
30+
github.com/fluxcd/pkg/apis/meta v1.15.0
3131
github.com/fluxcd/pkg/auth v0.18.0
3232
github.com/fluxcd/pkg/cache v0.9.0
3333
github.com/fluxcd/pkg/git v0.32.0
@@ -38,7 +38,7 @@ require (
3838
github.com/fluxcd/pkg/lockedfile v0.6.0
3939
github.com/fluxcd/pkg/masktoken v0.7.0
4040
github.com/fluxcd/pkg/oci v0.49.0
41-
github.com/fluxcd/pkg/runtime v0.60.0
41+
github.com/fluxcd/pkg/runtime v0.66.0
4242
github.com/fluxcd/pkg/sourceignore v0.12.0
4343
github.com/fluxcd/pkg/ssh v0.19.0
4444
github.com/fluxcd/pkg/tar v0.12.0
@@ -48,7 +48,7 @@ require (
4848
github.com/foxcpp/go-mockdns v1.1.0
4949
github.com/go-git/go-billy/v5 v5.6.2
5050
github.com/go-git/go-git/v5 v5.16.2
51-
github.com/go-logr/logr v1.4.2
51+
github.com/go-logr/logr v1.4.3
5252
github.com/google/go-containerregistry v0.20.5
5353
github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20241111191718-6bce25ecf029
5454
github.com/google/uuid v1.6.0
@@ -69,17 +69,17 @@ require (
6969
github.com/spf13/pflag v1.0.6
7070
golang.org/x/crypto v0.39.0
7171
golang.org/x/oauth2 v0.30.0
72-
golang.org/x/sync v0.15.0
72+
golang.org/x/sync v0.16.0
7373
google.golang.org/api v0.227.0
7474
gotest.tools v2.2.0+incompatible
7575
helm.sh/helm/v3 v3.17.3
76-
k8s.io/api v0.33.0
77-
k8s.io/apimachinery v0.33.0
78-
k8s.io/client-go v0.33.0
79-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
76+
k8s.io/api v0.33.2
77+
k8s.io/apimachinery v0.33.2
78+
k8s.io/client-go v0.33.2
79+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
8080
oras.land/oras-go/v2 v2.5.0
8181
sigs.k8s.io/controller-runtime v0.21.0
82-
sigs.k8s.io/yaml v1.4.0
82+
sigs.k8s.io/yaml v1.5.0
8383
)
8484

8585
require (
@@ -153,6 +153,7 @@ require (
153153
github.com/buildkite/go-pipeline v0.13.3 // indirect
154154
github.com/buildkite/interpolate v0.1.5 // indirect
155155
github.com/buildkite/roko v1.3.1 // indirect
156+
github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
156157
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
157158
github.com/cespare/xxhash/v2 v2.3.0 // indirect
158159
github.com/chai2010/gettext-go v1.0.2 // indirect
@@ -183,7 +184,7 @@ require (
183184
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
184185
github.com/docker/go-metrics v0.0.1 // indirect
185186
github.com/dustin/go-humanize v1.0.1 // indirect
186-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
187+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
187188
github.com/emirpasic/gods v1.18.1 // indirect
188189
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
189190
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
@@ -194,7 +195,7 @@ require (
194195
github.com/felixge/httpsnoop v1.0.4 // indirect
195196
github.com/fluxcd/gitkit v0.6.0 // indirect
196197
github.com/fluxcd/pkg/apis/acl v0.7.0 // indirect
197-
github.com/fsnotify/fsnotify v1.8.0 // indirect
198+
github.com/fsnotify/fsnotify v1.9.0 // indirect
198199
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
199200
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
200201
github.com/go-chi/chi v4.1.2+incompatible // indirect
@@ -209,7 +210,7 @@ require (
209210
github.com/go-logr/zapr v1.3.0 // indirect
210211
github.com/go-openapi/analysis v0.23.0 // indirect
211212
github.com/go-openapi/errors v0.22.1 // indirect
212-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
213+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
213214
github.com/go-openapi/jsonreference v0.21.0 // indirect
214215
github.com/go-openapi/loads v0.22.0 // indirect
215216
github.com/go-openapi/runtime v0.28.0 // indirect
@@ -229,7 +230,7 @@ require (
229230
github.com/golang/snappy v0.0.4 // indirect
230231
github.com/google/btree v1.1.3 // indirect
231232
github.com/google/certificate-transparency-go v1.3.1 // indirect
232-
github.com/google/gnostic-models v0.6.9 // indirect
233+
github.com/google/gnostic-models v0.7.0 // indirect
233234
github.com/google/go-cmp v0.7.0 // indirect
234235
github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20230516205744-dbecb1de8cfa // indirect
235236
github.com/google/go-github/v55 v55.0.0 // indirect
@@ -248,7 +249,7 @@ require (
248249
github.com/hashicorp/errwrap v1.1.0 // indirect
249250
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
250251
github.com/hashicorp/go-multierror v1.1.1 // indirect
251-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
252+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
252253
github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
253254
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
254255
github.com/huandu/xstrings v1.5.0 // indirect
@@ -310,8 +311,8 @@ require (
310311
github.com/pkg/errors v0.9.1 // indirect
311312
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
312313
github.com/prometheus/client_model v0.6.2 // indirect
313-
github.com/prometheus/common v0.63.0 // indirect
314-
github.com/prometheus/procfs v0.16.1 // indirect
314+
github.com/prometheus/common v0.65.0 // indirect
315+
github.com/prometheus/procfs v0.17.0 // indirect
315316
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
316317
github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
317318
github.com/redis/go-redis/v9 v9.7.3 // indirect
@@ -366,7 +367,7 @@ require (
366367
go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
367368
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
368369
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
369-
go.opentelemetry.io/otel v1.35.0 // indirect
370+
go.opentelemetry.io/otel v1.37.0 // indirect
370371
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
371372
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
372373
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
@@ -379,23 +380,25 @@ require (
379380
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
380381
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
381382
go.opentelemetry.io/otel/log v0.8.0 // indirect
382-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
383+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
383384
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
384385
go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
385386
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
386-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
387+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
387388
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
388389
go.uber.org/multierr v1.11.0 // indirect
389390
go.uber.org/zap v1.27.0 // indirect
391+
go.yaml.in/yaml/v2 v2.4.2 // indirect
392+
go.yaml.in/yaml/v3 v3.0.4 // indirect
390393
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
391394
golang.org/x/mod v0.25.0 // indirect
392-
golang.org/x/net v0.40.0 // indirect
393-
golang.org/x/sys v0.33.0 // indirect
394-
golang.org/x/term v0.32.0 // indirect
395-
golang.org/x/text v0.26.0 // indirect
396-
golang.org/x/time v0.11.0 // indirect
397-
golang.org/x/tools v0.33.0 // indirect
398-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
395+
golang.org/x/net v0.41.0 // indirect
396+
golang.org/x/sys v0.34.0 // indirect
397+
golang.org/x/term v0.33.0 // indirect
398+
golang.org/x/text v0.27.0 // indirect
399+
golang.org/x/time v0.12.0 // indirect
400+
golang.org/x/tools v0.34.0 // indirect
401+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
399402
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
400403
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
401404
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
@@ -407,17 +410,17 @@ require (
407410
gopkg.in/warnings.v0 v0.1.2 // indirect
408411
gopkg.in/yaml.v2 v2.4.0 // indirect
409412
gopkg.in/yaml.v3 v3.0.1 // indirect
410-
k8s.io/apiextensions-apiserver v0.33.0 // indirect
411-
k8s.io/apiserver v0.33.0 // indirect
412-
k8s.io/cli-runtime v0.33.0 // indirect
413-
k8s.io/component-base v0.33.0 // indirect
413+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
414+
k8s.io/apiserver v0.33.2 // indirect
415+
k8s.io/cli-runtime v0.33.2 // indirect
416+
k8s.io/component-base v0.33.2 // indirect
414417
k8s.io/klog/v2 v2.130.1 // indirect
415-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
416-
k8s.io/kubectl v0.33.0 // indirect
418+
k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
419+
k8s.io/kubectl v0.33.2 // indirect
417420
oras.land/oras-go v1.2.5 // indirect
418421
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
419-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
420-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
422+
sigs.k8s.io/kustomize/api v0.20.0 // indirect
423+
sigs.k8s.io/kustomize/kyaml v0.20.0 // indirect
421424
sigs.k8s.io/randfill v1.0.0 // indirect
422425
sigs.k8s.io/release-utils v0.11.1 // indirect
423426
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect

0 commit comments

Comments
 (0)