Skip to content

Commit 9422e64

Browse files
fix(deps): Update CAPX to v1.7.0 (#1248)
Update hack/third-party/capx/go.mod and run `make apis.sync`
1 parent d638b0c commit 9422e64

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const (
4444
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
4545

4646
// NutanixClusterSpec defines the desired state of NutanixCluster
47+
// +kubebuilder:validation:XValidation:rule="!(has(self.failureDomains) && has(self.controlPlaneFailureDomains))",message="Cannot set both 'failureDomains' and 'controlPlaneFailureDomains' fields simultaneously. Use 'controlPlaneFailureDomains' as 'failureDomains' is deprecated."
4748
type NutanixClusterSpec struct {
4849
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
4950
// Important: Run "make" to regenerate code after modifying this file

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ spec:
285285
controlPlaneEndpoint:
286286
host: PLACEHOLDER
287287
port: 6443
288-
failureDomains: []
289288
prismCentral:
290289
address: PLACEHOLDER
291290
credentialRef:

hack/examples/bases/nutanix/clusterclass/kustomization.yaml.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,10 @@ ${KUBE_VIP_CONTENT}
9999
name: PLACEHOLDER
100100
kind: Secret
101101
namespace: default
102+
103+
# Remove empty failureDomains array from NutanixClusterTemplate
104+
- target:
105+
kind: NutanixClusterTemplate
106+
patch: |-
107+
- op: "remove"
108+
path: "/spec/template/spec/failureDomains"

hack/third-party/capx/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.24.0
77

88
toolchain go1.24.3
99

10-
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.0-beta.5
10+
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.0
1111

1212
require (
1313
github.com/emicklei/go-restful/v3 v3.12.2 // indirect

hack/third-party/capx/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/
7676
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
7777
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
7878
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
79-
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.0-beta.5 h1:P3GCQbY5zynEgQLEn8KwG8ZicXSoX2z8ShFUnwkgE1s=
80-
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.0-beta.5/go.mod h1:6AJwae8W/nGmITlnuTnvMxCxxztctEAUJulxC9z/jgU=
79+
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.0 h1:HLfiahNib53AzH5frN5OG5Xoimr8G4DqnpR/inpBnXg=
80+
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.7.0/go.mod h1:6AJwae8W/nGmITlnuTnvMxCxxztctEAUJulxC9z/jgU=
8181
github.com/nutanix-cloud-native/prism-go-client v0.5.0 h1:aSNuKDOK7+q676MQyetYXcySY41IjSvN2UmrDIU3+6s=
8282
github.com/nutanix-cloud-native/prism-go-client v0.5.0/go.mod h1:QhLX+sEep0cStzHVYU6mPgIlnA8U3DySskagrbDprRk=
8383
github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=

0 commit comments

Comments
 (0)