Skip to content

Commit 62b0a57

Browse files
thunderboltsidthunderboltsid
committed
fix(compatibility): Support Cluster deployments on PC v7.3 (#1149)
1 parent d8d0387 commit 62b0a57

File tree

11 files changed

+55
-29
lines changed

11 files changed

+55
-29
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,24 @@ type NutanixResourceIdentifier struct {
7474
Name *string `json:"name,omitempty"`
7575
}
7676

77+
func (nri NutanixResourceIdentifier) String() string {
78+
if nri.Type == NutanixIdentifierUUID && nri.UUID != nil {
79+
return *nri.UUID
80+
}
81+
if nri.Type == NutanixIdentifierName && nri.Name != nil {
82+
return *nri.Name
83+
}
84+
return ""
85+
}
86+
87+
func (nri NutanixResourceIdentifier) IsUUID() bool {
88+
return nri.Type == NutanixIdentifierUUID && nri.UUID != nil
89+
}
90+
91+
func (nri NutanixResourceIdentifier) IsName() bool {
92+
return nri.Type == NutanixIdentifierName && nri.Name != nil
93+
}
94+
7795
type NutanixCategoryIdentifier struct {
7896
// key is the Key of category in PC.
7997
// +optional

‎api/versions/coredns.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/versions/coredns_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func TestReturnsCorrectMappingForGetKubernetesToCoreDNSVersionMap(t *testing.T)
4747
"v1.30": "v1.11.3",
4848
"v1.31": "v1.11.3",
4949
"v1.32": "v1.11.3",
50+
"v1.33": "v1.12.0",
5051
}
5152
assert.Equal(t, expected, mapping)
5253
}

‎charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data:
4545
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://nutanix.github.io/helm/{{ end }}'
4646
nutanix-storage-csi: |
4747
ChartName: nutanix-csi-storage
48-
ChartVersion: 3.2.0
48+
ChartVersion: 3.3.3
4949
RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://nutanix.github.io/helm-releases/{{ end }}'
5050
snapshot-controller: |
5151
ChartName: snapshot-controller

‎devbox.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,50 +1141,50 @@
11411141
}
11421142
},
11431143
"kind@latest": {
1144-
"last_modified": "2025-01-19T08:16:51Z",
1145-
"resolved": "github:NixOS/nixpkgs/50165c4f7eb48ce82bd063e1fb8047a0f515f8ce#kind",
1144+
"last_modified": "2025-05-16T20:19:48Z",
1145+
"resolved": "github:NixOS/nixpkgs/12a55407652e04dcf2309436eb06fef0d3713ef3#kind",
11461146
"source": "devbox-search",
1147-
"version": "0.26.0",
1147+
"version": "0.27.0",
11481148
"systems": {
11491149
"aarch64-darwin": {
11501150
"outputs": [
11511151
{
11521152
"name": "out",
1153-
"path": "/nix/store/4j12j5zijvbcyafx85a2qh8jkv4m6lnz-kind-0.26.0",
1153+
"path": "/nix/store/hxi2yz0v53i2vdjgrpiiw5f1l1xrn8ra-kind-0.27.0",
11541154
"default": true
11551155
}
11561156
],
1157-
"store_path": "/nix/store/4j12j5zijvbcyafx85a2qh8jkv4m6lnz-kind-0.26.0"
1157+
"store_path": "/nix/store/hxi2yz0v53i2vdjgrpiiw5f1l1xrn8ra-kind-0.27.0"
11581158
},
11591159
"aarch64-linux": {
11601160
"outputs": [
11611161
{
11621162
"name": "out",
1163-
"path": "/nix/store/gkpan5sh4kmbxknrf79p9ssd1j024ydb-kind-0.26.0",
1163+
"path": "/nix/store/0sa4hv12sq8q3m73g2kdav18yb0jbnmm-kind-0.27.0",
11641164
"default": true
11651165
}
11661166
],
1167-
"store_path": "/nix/store/gkpan5sh4kmbxknrf79p9ssd1j024ydb-kind-0.26.0"
1167+
"store_path": "/nix/store/0sa4hv12sq8q3m73g2kdav18yb0jbnmm-kind-0.27.0"
11681168
},
11691169
"x86_64-darwin": {
11701170
"outputs": [
11711171
{
11721172
"name": "out",
1173-
"path": "/nix/store/2vsw8jyi2n4sm74sk1kbff6hq5v8nz6i-kind-0.26.0",
1173+
"path": "/nix/store/dkm6ibjbk5ra51cvr637iy2gfcrlbqp0-kind-0.27.0",
11741174
"default": true
11751175
}
11761176
],
1177-
"store_path": "/nix/store/2vsw8jyi2n4sm74sk1kbff6hq5v8nz6i-kind-0.26.0"
1177+
"store_path": "/nix/store/dkm6ibjbk5ra51cvr637iy2gfcrlbqp0-kind-0.27.0"
11781178
},
11791179
"x86_64-linux": {
11801180
"outputs": [
11811181
{
11821182
"name": "out",
1183-
"path": "/nix/store/hp80rb9dpsk2wj5db2zngh5b8hrgwy4k-kind-0.26.0",
1183+
"path": "/nix/store/1f4qk0ga3550d8w4lvqvrf5jrjz59kdy-kind-0.27.0",
11841184
"default": true
11851185
}
11861186
],
1187-
"store_path": "/nix/store/hp80rb9dpsk2wj5db2zngh5b8hrgwy4k-kind-0.26.0"
1187+
"store_path": "/nix/store/1f4qk0ga3550d8w4lvqvrf5jrjz59kdy-kind-0.27.0"
11881188
}
11891189
}
11901190
},

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ require (
4747
)
4848

4949
require (
50+
al.essio.dev/pkg/shellescape v1.5.1 // indirect
5051
dario.cat/mergo v1.0.1 // indirect
5152
github.com/BurntSushi/toml v1.4.0 // indirect
5253
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -56,7 +57,6 @@ require (
5657
github.com/Microsoft/go-winio v0.6.1 // indirect
5758
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
5859
github.com/adrg/xdg v0.5.3 // indirect
59-
github.com/alessio/shellescape v1.4.2 // indirect
6060
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6161
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6262
github.com/aws/aws-sdk-go v1.55.6 // indirect
@@ -168,6 +168,6 @@ require (
168168
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
169169
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
170170
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
171-
sigs.k8s.io/kind v0.25.0 // indirect
171+
sigs.k8s.io/kind v0.27.0 // indirect
172172
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
173173
)

‎go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
2+
al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
13
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
24
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
35
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
@@ -18,8 +20,6 @@ github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwF
1820
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
1921
github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
2022
github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
21-
github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
22-
github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
2323
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
2424
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
2525
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
@@ -123,6 +123,8 @@ github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/Z
123123
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
124124
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 h1:SJ+NtwL6QaZ21U+IrK7d0gGgpjGGvd2kz+FzTHVzdqI=
125125
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2/go.mod h1:Tv1PlzqC9t8wNnpPdctvtSUOPUUg4SHeE6vR1Ir2hmg=
126+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
127+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
126128
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
127129
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
128130
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
@@ -424,8 +426,8 @@ sigs.k8s.io/controller-runtime v0.19.5 h1:rsE2cRYe0hK/rAAwiS1bwqgEcgCxTz9lavs3FM
424426
sigs.k8s.io/controller-runtime v0.19.5/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
425427
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
426428
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
427-
sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=
428-
sigs.k8s.io/kind v0.25.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
429+
sigs.k8s.io/kind v0.27.0 h1:PQ3f0iAWNIj66LYkZ1ivhEg/+Zb6UPMbO+qVei/INZA=
430+
sigs.k8s.io/kind v0.27.0/go.mod h1:RZVFmy6qcwlSWwp6xeIUv7kXCPF3i8MXsEXxW/J+gJY=
429431
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
430432
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
431433
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

‎hack/addons/helm-chart-bundler/repos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ repositories:
5555
repoURL: https://nutanix.github.io/helm-releases/
5656
charts:
5757
nutanix-csi-storage:
58-
- 3.2.0
58+
- 3.3.3
5959
snapshot-controller:
6060
repoURL: https://piraeus.io/helm-charts/
6161
charts:

‎hack/third-party/capx/go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/external/capx
55

6-
go 1.22.1
6+
go 1.23.0
77

8-
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.5.3
8+
toolchain go1.24.2
9+
10+
require github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.5.4
911

1012
require (
1113
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
@@ -25,7 +27,7 @@ require (
2527
github.com/nutanix-cloud-native/prism-go-client v0.5.0 // indirect
2628
github.com/pkg/errors v0.9.1 // indirect
2729
golang.org/x/net v0.27.0 // indirect
28-
golang.org/x/text v0.16.0 // indirect
30+
golang.org/x/text v0.22.0 // indirect
2931
google.golang.org/protobuf v1.34.1 // indirect
3032
gopkg.in/inf.v0 v0.9.1 // indirect
3133
gopkg.in/yaml.v2 v2.4.0 // indirect

‎hack/third-party/capx/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
7272
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
7373
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
7474
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
75-
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.5.3 h1:6F2IrYW1Ky3oo44rGcvvGgUo6wqPA8fjjou3kjKVNbk=
76-
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.5.3/go.mod h1:cujPL3lTeW8+zr8RUJCPDss1HHe81Hc9XxXMNrdTSqQ=
75+
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.5.4 h1:BsqxFpYwGFLsjmv1NIzjuOwXyQ8n9rMYI5PXjdh5Cg4=
76+
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.5.4/go.mod h1:KyzqJ6NAX3zWYKMcVNb5rUUx5wwdQEo6seXy6VDf9Kc=
7777
github.com/nutanix-cloud-native/prism-go-client v0.5.0 h1:aSNuKDOK7+q676MQyetYXcySY41IjSvN2UmrDIU3+6s=
7878
github.com/nutanix-cloud-native/prism-go-client v0.5.0/go.mod h1:QhLX+sEep0cStzHVYU6mPgIlnA8U3DySskagrbDprRk=
7979
github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=
@@ -128,12 +128,12 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
128128
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
129129
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
130130
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
131-
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
132-
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
131+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
132+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
133133
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
134134
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
135-
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
136-
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
135+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
136+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
137137
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
138138
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
139139
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=

0 commit comments

Comments
 (0)