Skip to content

Commit 4513fe1

Browse files
authored
Merge pull request #383 from mboersma/bump-capi
🌱 Bump CAPI to v1.9.6
2 parents e0e361b + 468f1fb commit 4513fe1

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ BUILD_CONTAINER_ADDITIONAL_ARGS ?=
5151
#
5252
# Kubebuilder.
5353
#
54-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
54+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
5555
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
5656
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
5757

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-addon-provider-helm
22

33
go 1.22.0
44

5-
toolchain go1.22.10
5+
toolchain go1.22.12
66

77
require (
88
github.com/Masterminds/sprig/v3 v3.3.0
@@ -21,9 +21,9 @@ require (
2121
k8s.io/component-base v0.31.3
2222
k8s.io/klog/v2 v2.130.1
2323
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
24-
sigs.k8s.io/cluster-api v1.9.4
25-
sigs.k8s.io/cluster-api/test v1.9.4
26-
sigs.k8s.io/controller-runtime v0.19.4
24+
sigs.k8s.io/cluster-api v1.9.6
25+
sigs.k8s.io/cluster-api/test v1.9.6
26+
sigs.k8s.io/controller-runtime v0.19.6
2727
)
2828

2929
require (
@@ -206,4 +206,4 @@ require (
206206
sigs.k8s.io/yaml v1.4.0 // indirect
207207
)
208208

209-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.4
209+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.6

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -686,12 +686,12 @@ oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
686686
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
687687
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
688688
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
689-
sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
690-
sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
691-
sigs.k8s.io/cluster-api/test v1.9.4 h1:ZZ+IPK/lfyc4d/QPtompt+cxXYC6tGJ4kTHhhocgbIM=
692-
sigs.k8s.io/cluster-api/test v1.9.4/go.mod h1:dHLUcNc9vBNyQyY6NTcqcfpFvIiXmcL5Iqe2sETFD1c=
693-
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
694-
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
689+
sigs.k8s.io/cluster-api v1.9.6 h1:2jZ434qC0bzrPQzmRDm4/b0PZWVMnOocoCjsAonQN5Q=
690+
sigs.k8s.io/cluster-api v1.9.6/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI=
691+
sigs.k8s.io/cluster-api/test v1.9.6 h1:bnplAOqKRBFWP2q2L8kbY2DZTLBY8JTpucnGSLgS/Kw=
692+
sigs.k8s.io/cluster-api/test v1.9.6/go.mod h1:YL2wANe8TFWFBka9CDkxjPj7KALqUtK+PtKa4ChNIok=
693+
sigs.k8s.io/controller-runtime v0.19.6 h1:fuq53qTLQ7aJTA7aNsklNnu7eQtSFqJUomOyM+phPLk=
694+
sigs.k8s.io/controller-runtime v0.19.6/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
695695
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
696696
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
697697
sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=

0 commit comments

Comments
 (0)