Skip to content

Commit 7a69534

Browse files
authored
Update cluster-api to v1.7.4 (#1878)
1 parent 0088ba5 commit 7a69534

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go 1.21
66
replace (
77
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.17.1
88
github.com/onsi/gomega => github.com/onsi/gomega v1.32.0
9-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.3
9+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.4
1010
)
1111

1212
require (
@@ -39,8 +39,8 @@ require (
3939
k8s.io/client-go v0.29.3
4040
k8s.io/klog/v2 v2.110.1
4141
k8s.io/utils v0.0.0-20231127182322-b307cd553661
42-
sigs.k8s.io/cluster-api v1.7.3
43-
sigs.k8s.io/cluster-api/test v1.7.3
42+
sigs.k8s.io/cluster-api v1.7.4
43+
sigs.k8s.io/cluster-api/test v1.7.4
4444
sigs.k8s.io/controller-runtime v0.17.3
4545
sigs.k8s.io/yaml v1.4.0
4646
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,10 @@ k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6R
528528
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
529529
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
530530
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
531-
sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
532-
sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
533-
sigs.k8s.io/cluster-api/test v1.7.3 h1:Nl1IOF03MZzjr6x45IJOFWlV4cNHpJ45qsn3A+1Tf98=
534-
sigs.k8s.io/cluster-api/test v1.7.3/go.mod h1:KbK8+zZEmSopCm6IGd9Vk+573sQ+HL6hnPvqelJEYi4=
531+
sigs.k8s.io/cluster-api v1.7.4 h1:gT9WGbLXKE19pNR6s/cTLRqK2G0EbwxxQrUrw7/w5P4=
532+
sigs.k8s.io/cluster-api v1.7.4/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
533+
sigs.k8s.io/cluster-api/test v1.7.4 h1:yBeWaQoPcAbLMF/ddgz0IWJiFgfJe+QfZJ4QWexMVOw=
534+
sigs.k8s.io/cluster-api/test v1.7.4/go.mod h1:KbK8+zZEmSopCm6IGd9Vk+573sQ+HL6hnPvqelJEYi4=
535535
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
536536
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
537537
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

hack/tools/go.mod

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

33
go 1.21
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.3
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.4
66

77
require (
88
github.com/aquasecurity/trivy v0.48.3
@@ -15,7 +15,7 @@ require (
1515
golang.org/x/vuln v1.1.2
1616
gotest.tools/gotestsum v1.12.0
1717
k8s.io/code-generator v0.29.3
18-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240610143846-b0284d8b9bf1
18+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240709071601-53f0c5375dbd
1919
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
2020
sigs.k8s.io/controller-tools v0.14.0
2121
sigs.k8s.io/kustomize/kustomize/v5 v5.4.2

hack/tools/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,10 +2476,10 @@ oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
24762476
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
24772477
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
24782478
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
2479-
sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
2480-
sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
2481-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240610143846-b0284d8b9bf1 h1:Q2smE1Ai5Nqn+8/61MFL6tdo3E5av1k8T2RsnokqThA=
2482-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240610143846-b0284d8b9bf1/go.mod h1:/I/TWwxKZ+5faLcdKqE8bAi0eUYROP/lybV6e97ENMs=
2479+
sigs.k8s.io/cluster-api v1.7.4 h1:gT9WGbLXKE19pNR6s/cTLRqK2G0EbwxxQrUrw7/w5P4=
2480+
sigs.k8s.io/cluster-api v1.7.4/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
2481+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240709071601-53f0c5375dbd h1:sfv0l3vTPsgJjzpV0vKmODvV1yaUV4LyGHQl7S6DvcQ=
2482+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240709071601-53f0c5375dbd/go.mod h1:/I/TWwxKZ+5faLcdKqE8bAi0eUYROP/lybV6e97ENMs=
24832483
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
24842484
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
24852485
sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A=

test/e2e/config/ibmcloud-e2e-powervs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.7.3
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/core-components.yaml
12+
- name: v1.7.4
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.7.3
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/bootstrap-components.yaml
20+
- name: v1.7.4
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.7.3
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/control-plane-components.yaml
28+
- name: v1.7.4
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

test/e2e/config/ibmcloud-e2e-vpc.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.7.3
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/core-components.yaml
12+
- name: v1.7.4
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.7.3
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/bootstrap-components.yaml
20+
- name: v1.7.4
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.7.3
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/control-plane-components.yaml
28+
- name: v1.7.4
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

0 commit comments

Comments
 (0)