Skip to content

Commit 83f0d3b

Browse files
myasnikovdaniilmyasnikovdaniil
committed
build(deps): bump helm-controller/api to v1.5.1 for kstatus types
The kstatus readiness work (#2642) sets WaitStrategy / kustomize.CustomHealthCheck / HelmReleaseSpec.HealthCheckExprs on generated HelmReleases. Those Go types do not exist at helm-controller/api v1.4.3 — the runtime CRD is already v1.5.0 (shipped by #2602), so this closes a Go-types-vs-runtime skew rather than getting ahead of the runtime. The bump is not isolated: helm-controller/api v1.5.x requires k8s 0.35 + controller-runtime 0.23, cascading the k8s stack 0.34 -> 0.35. cozystack replaces k8s.io/apimachinery with a fork carrying the (still-open) upstream ConvertToVersion patch k/k#135537; that single commit is rebased cleanly onto apimachinery v0.35.0 at cozystack/[email protected]. The repo builds with no source changes under the new stack. Refs #2642 Assisted-By: Claude <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent a3829ab commit 83f0d3b

2 files changed

Lines changed: 111 additions & 83 deletions

File tree

‎go.mod‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,42 @@ require (
88
github.com/cert-manager/cert-manager v1.17.4
99
github.com/cozystack/cozystack-scheduler/pkg/apis v0.1.1
1010
github.com/emicklei/dot v1.10.0
11-
github.com/fluxcd/helm-controller/api v1.4.3
12-
github.com/fluxcd/pkg/apis/meta v1.23.0
11+
github.com/fluxcd/helm-controller/api v1.5.1
12+
github.com/fluxcd/pkg/apis/kustomize v1.15.0
13+
github.com/fluxcd/pkg/apis/meta v1.25.0
1314
github.com/fluxcd/source-controller/api v1.7.4
1415
github.com/fluxcd/source-watcher/api/v2 v2.0.3
1516
github.com/go-logr/logr v1.4.3
1617
github.com/go-logr/zapr v1.3.0
1718
github.com/go-task/slim-sprig/v3 v3.0.0
18-
github.com/onsi/ginkgo/v2 v2.23.3
19-
github.com/onsi/gomega v1.37.0
20-
github.com/prometheus/client_golang v1.23.0
19+
github.com/onsi/ginkgo/v2 v2.27.2
20+
github.com/onsi/gomega v1.38.2
21+
github.com/prometheus/client_golang v1.23.2
2122
github.com/robfig/cron/v3 v3.0.1
22-
github.com/spf13/cobra v1.9.1
23+
github.com/spf13/cobra v1.10.0
2324
github.com/vmware-tanzu/velero v1.17.1
2425
go.uber.org/zap v1.27.0
2526
gomodules.xyz/jsonpatch/v2 v2.4.0
26-
k8s.io/api v0.34.1
27-
k8s.io/apiextensions-apiserver v0.34.1
28-
k8s.io/apimachinery v0.34.2
29-
k8s.io/apiserver v0.34.1
30-
k8s.io/client-go v0.34.1
31-
k8s.io/component-base v0.34.1
27+
k8s.io/api v0.35.0
28+
k8s.io/apiextensions-apiserver v0.35.0
29+
k8s.io/apimachinery v0.35.0
30+
k8s.io/apiserver v0.35.0
31+
k8s.io/client-go v0.35.0
32+
k8s.io/component-base v0.35.0
3233
k8s.io/klog/v2 v2.130.1
33-
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3
34-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
34+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
35+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
3536
sigs.k8s.io/container-object-storage-interface-api v0.1.0
36-
sigs.k8s.io/controller-runtime v0.22.4
37+
sigs.k8s.io/controller-runtime v0.23.1
3738
sigs.k8s.io/gateway-api v1.4.1
3839
sigs.k8s.io/randfill v1.0.0
39-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0
40+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482
4041
sigs.k8s.io/yaml v1.6.0
4142
)
4243

4344
require (
4445
cel.dev/expr v0.25.1 // indirect
46+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4547
github.com/NYTimes/gziphandler v1.1.1 // indirect
4648
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
4749
github.com/beorn7/perks v1.0.1 // indirect
@@ -55,7 +57,6 @@ require (
5557
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5658
github.com/felixge/httpsnoop v1.0.4 // indirect
5759
github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
58-
github.com/fluxcd/pkg/apis/kustomize v1.13.0 // indirect
5960
github.com/fsnotify/fsnotify v1.9.0 // indirect
6061
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
6162
github.com/go-logr/stdr v1.2.2 // indirect
@@ -68,7 +69,7 @@ require (
6869
github.com/google/cel-go v0.26.0 // indirect
6970
github.com/google/gnostic-models v0.7.0 // indirect
7071
github.com/google/go-cmp v0.7.0 // indirect
71-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
72+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
7273
github.com/google/uuid v1.6.0 // indirect
7374
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
7475
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -85,14 +86,14 @@ require (
8586
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8687
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8788
github.com/prometheus/client_model v0.6.2 // indirect
88-
github.com/prometheus/common v0.65.0 // indirect
89+
github.com/prometheus/common v0.66.1 // indirect
8990
github.com/prometheus/procfs v0.17.0 // indirect
90-
github.com/spf13/pflag v1.0.7 // indirect
91+
github.com/spf13/pflag v1.0.9 // indirect
9192
github.com/stoewer/go-strcase v1.3.0 // indirect
9293
github.com/x448/float16 v0.8.4 // indirect
93-
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
94-
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
95-
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
94+
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
95+
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
96+
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
9697
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
9798
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
9899
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
@@ -104,10 +105,11 @@ require (
104105
go.opentelemetry.io/otel/trace v1.43.0 // indirect
105106
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
106107
go.uber.org/multierr v1.11.0 // indirect
107-
go.yaml.in/yaml/v2 v2.4.2 // indirect
108+
go.yaml.in/yaml/v2 v2.4.3 // indirect
108109
go.yaml.in/yaml/v3 v3.0.4 // indirect
109110
golang.org/x/crypto v0.52.0 // indirect
110111
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
112+
golang.org/x/mod v0.35.0 // indirect
111113
golang.org/x/net v0.55.0 // indirect
112114
golang.org/x/oauth2 v0.35.0 // indirect
113115
golang.org/x/sync v0.20.0 // indirect
@@ -124,10 +126,10 @@ require (
124126
gopkg.in/inf.v0 v0.9.1 // indirect
125127
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
126128
gopkg.in/yaml.v3 v3.0.1 // indirect
127-
k8s.io/kms v0.34.1 // indirect
129+
k8s.io/kms v0.35.0 // indirect
128130
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
129131
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
130132
)
131133

132134
// See: issues.k8s.io/135537
133-
replace k8s.io/apimachinery => github.com/cozystack/apimachinery v0.0.0-20251219010959-1f91eabae46c
135+
replace k8s.io/apimachinery => github.com/cozystack/apimachinery v0.0.0-20260710062224-763e1451713b

0 commit comments

Comments
 (0)