Skip to content

Commit 6574f66

Browse files
authored
build(deps): Upgrade CAPX version to v1.5.0-beta.1 (#827)
**What problem does this PR solve?**: Updates to a CAPX version that fixes CSI issue where VMs with attacked volumes cannot get deleted. **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent cc342d5 commit 6574f66

File tree

4 files changed

+93
-101
lines changed

4 files changed

+93
-101
lines changed

api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1/conditions.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2020

2121
const (
2222
DeletionFailed = "DeletionFailed"
23+
24+
VolumeGroupDetachFailed = "VolumeGroupDetachFailed"
2325
)
2426

2527
const (
@@ -42,9 +44,11 @@ const (
4244

4345
const (
4446
// PrismCentralClientCondition indicates the status of the client used to connect to Prism Central
45-
PrismCentralClientCondition capiv1.ConditionType = "PrismClientInit"
47+
PrismCentralClientCondition capiv1.ConditionType = "PrismClientInit"
48+
PrismCentralV4ClientCondition capiv1.ConditionType = "PrismClientV4Init"
4649

47-
PrismCentralClientInitializationFailed = "PrismClientInitFailed"
50+
PrismCentralClientInitializationFailed = "PrismClientInitFailed"
51+
PrismCentralV4ClientInitializationFailed = "PrismClientV4InitFailed"
4852
)
4953

5054
const (

hack/third-party/capx/go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,39 @@ go 1.22.1
77

88
toolchain go1.22.2
99

10-
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.4.0
10+
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.5.0-beta.1
1111

1212
require (
13-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
13+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
1414
github.com/go-logr/logr v1.4.1 // indirect
15-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
16-
github.com/go-openapi/jsonreference v0.20.2 // indirect
17-
github.com/go-openapi/swag v0.22.3 // indirect
15+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
16+
github.com/go-openapi/jsonreference v0.21.0 // indirect
17+
github.com/go-openapi/swag v0.23.0 // indirect
1818
github.com/gogo/protobuf v1.3.2 // indirect
19-
github.com/golang/protobuf v1.5.3 // indirect
19+
github.com/golang/protobuf v1.5.4 // indirect
2020
github.com/google/gnostic-models v0.6.8 // indirect
2121
github.com/google/gofuzz v1.2.0 // indirect
2222
github.com/josharian/intern v1.0.0 // indirect
2323
github.com/json-iterator/go v1.1.12 // indirect
2424
github.com/mailru/easyjson v0.7.7 // indirect
2525
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2626
github.com/modern-go/reflect2 v1.0.2 // indirect
27-
github.com/nutanix-cloud-native/prism-go-client v0.4.0 // indirect
27+
github.com/nutanix-cloud-native/prism-go-client v0.4.1-0.20240723182624-ebad4f1ab5c5 // indirect
2828
github.com/pkg/errors v0.9.1 // indirect
29-
golang.org/x/net v0.24.0 // indirect
30-
golang.org/x/text v0.14.0 // indirect
31-
google.golang.org/protobuf v1.31.0 // indirect
29+
golang.org/x/net v0.25.0 // indirect
30+
golang.org/x/text v0.15.0 // indirect
31+
google.golang.org/protobuf v1.33.0 // indirect
3232
gopkg.in/inf.v0 v0.9.1 // indirect
3333
gopkg.in/yaml.v2 v2.4.0 // indirect
3434
gopkg.in/yaml.v3 v3.0.1 // indirect
35-
k8s.io/api v0.29.2 // indirect
36-
k8s.io/apiextensions-apiserver v0.29.2 // indirect
37-
k8s.io/apimachinery v0.29.2 // indirect
35+
k8s.io/api v0.29.7 // indirect
36+
k8s.io/apiextensions-apiserver v0.29.7 // indirect
37+
k8s.io/apimachinery v0.29.7 // indirect
3838
k8s.io/klog/v2 v2.110.1 // indirect
3939
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
4040
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
41-
sigs.k8s.io/cluster-api v1.6.2 // indirect
42-
sigs.k8s.io/controller-runtime v0.16.5 // indirect
41+
sigs.k8s.io/cluster-api v1.7.4 // indirect
42+
sigs.k8s.io/controller-runtime v0.17.3 // indirect
4343
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
4444
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
4545
)

0 commit comments

Comments
 (0)