Skip to content

Commit b9c4ceb

Browse files
snarkychefsnarkychef
authored
Revert "Bump nutanix-cloud-native/cluster-api-provider-nutanix to latest rele…" (#5147)
This reverts commit 63a529f.
1 parent ccdbdfe commit b9c4ceb

8 files changed

Lines changed: 349 additions & 513 deletions

File tree

‎UPSTREAM_PROJECTS.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ projects:
255255
go_version: "1.24"
256256
- name: cluster-api-provider-nutanix
257257
versions:
258-
- tag: v1.8.3
259-
go_version: "1.24"
258+
- tag: v1.6.1
259+
go_version: "1.23"
260260
- org: opencontainers
261261
repos:
262262
- name: runc

‎projects/nutanix-cloud-native/cluster-api-provider-nutanix/ATTRIBUTION.txt‎

Lines changed: 214 additions & 505 deletions
Large diffs are not rendered by default.

‎projects/nutanix-cloud-native/cluster-api-provider-nutanix/CHECKSUMS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
5b5b0387015c3536494a65dd65969deebf1d2b1f9598771ee4feea093b5c4efd _output/bin/cluster-api-provider-nutanix/linux-amd64/manager
2-
e91420080c445ad8d500b12ebc3515b59e82c35c209c8c0244bc42d24929f818 _output/bin/cluster-api-provider-nutanix/linux-arm64/manager
1+
7562e08f9e8f750d09d438c8e5ff8660ded2dc211b6bbb95c278bd0480e2dc0d _output/bin/cluster-api-provider-nutanix/linux-amd64/manager
2+
ea944d0a2084d61a2b167637be34bb64357faa4c4e4072ac2a940c02cb57340f _output/bin/cluster-api-provider-nutanix/linux-arm64/manager

‎projects/nutanix-cloud-native/cluster-api-provider-nutanix/GIT_TAG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.8.3
1+
v1.6.1

‎projects/nutanix-cloud-native/cluster-api-provider-nutanix/GOLANG_VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24
1+
1.23

‎projects/nutanix-cloud-native/cluster-api-provider-nutanix/Makefile‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,29 @@ EXTRA_GO_LDFLAGS=$(shell $(BUILD_LIB)/version.sh $(REPO) sigs.k8s.io/cluster-api
1212

1313
HAS_S3_ARTIFACTS=true
1414

15+
FIX_LICENSES_STORAGE_GO_CLIENT_TARGET=$(REPO)/vendor/github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4/LICENSE.txt
16+
1517
TOOLS_BIN_DIR := $(shell pwd)/hack/tools/bin
1618
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
1719
GO_BIN_PATH=$(shell source $(BUILD_LIB)/common.sh && build::common::get_go_path $(GOLANG_VERSION))
1820
GO=$(GO_BIN_PATH)/go
1921

2022
include $(BASE_DIRECTORY)/Common.mk
2123

24+
$(GATHER_LICENSES_TARGETS): $(FIX_LICENSES_STORAGE_GO_CLIENT_TARGET)
25+
26+
.PHONY: $(FIX_LICENSES_STORAGE_GO_CLIENT_TARGET)
27+
$(FIX_LICENSES_STORAGE_GO_CLIENT_TARGET): | $(GO_MOD_DOWNLOAD_TARGETS)
28+
wget -q --retry-connrefused https://raw.githubusercontent.com/nutanix/ntnx-api-golang-clients/refs/heads/main/LICENSE.md -O \
29+
$(REPO)/vendor/github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4/LICENSE.txt; \
30+
2231
s3-artifacts: create-manifests
2332

2433
$(TOOLS_BIN_DIR):
2534
@mkdir -p $(TOOLS_BIN_DIR)
2635

2736
$(CONTROLLER_GEN): $(TOOLS_BIN_DIR)
28-
GOBIN=$(TOOLS_BIN_DIR) $(GO) install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3
37+
GOBIN=$(TOOLS_BIN_DIR) $(GO) install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
2938

3039
.PHONY: create-manifests
3140
create-manifests: export PATH:=$(TOOLS_BIN_DIR):$(MAKE_ROOT)/$(OUTPUT_DIR):$(PATH)

‎projects/nutanix-cloud-native/cluster-api-provider-nutanix/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## **Cluster API Provider for Nutanix**
2-
![Version](https://img.shields.io/badge/version-v1.8.3-blue)
2+
![Version](https://img.shields.io/badge/version-v1.6.1-blue)
33
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiWXJwaXpMSkhOTHpUSFU0K2IrSDlnZUFGMjdIRWIvSFNRZllHVmdURTFyRHpxOXlkSmdPTVd2YXhUSDVzY0U1ajVXUDhFRkZXYVp3ZHBhQS9jd3JUTXRNPSIsIml2UGFyYW1ldGVyU3BlYyI6IkhaaGRzVUdUQzlFY29MQ0YiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
44

55
The [Cluster API Provider for Nutanix (CAPX)](https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix) is a the implementation of Cluster API for Nutanix.

‎projects/nutanix-cloud-native/cluster-api-provider-nutanix/patches/0001-Update-ntnx-api-golang-clients-Go-mod-to-fix-licensi.patch‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
From 767973a818f816ffd119e92066eebae875b1a96a Mon Sep 17 00:00:00 2001
2+
From: Abhay Krishna Arunachalam <arnchlm@amazon.com>
3+
Date: Tue, 4 Feb 2025 13:55:47 -0800
4+
Subject: [PATCH] Update ntnx-api-golang-clients Go mod to fix licensing issue
5+
6+
The nutanix/ntnx-api-golang-clients Go module imported by CAPX was previously under a Nutanix
7+
proprietary license, but it has now been re-licensed to Apache-2.0, so this patch updates the
8+
Go mod to the commit that includes the license change.
9+
10+
The go.keploy.io/server module version v0.8.6 had a Go mod checksum error possibly due to recreating
11+
the tag, v0.7.19 was the latest one that was didn't error out.
12+
13+
Signed-off-by: Abhay Krishna Arunachalam <arnchlm@amazon.com>
14+
---
15+
go.mod | 25 ++++++++++++++++++++++---
16+
go.sum | 28 ++++++++++++++--------------
17+
2 files changed, 36 insertions(+), 17 deletions(-)
18+
19+
diff --git a/go.mod b/go.mod
20+
index e289515..0a06d06 100644
21+
--- a/go.mod
22+
+++ b/go.mod
23+
@@ -11,7 +11,7 @@ require (
24+
github.com/google/go-cmp v0.6.0
25+
github.com/google/uuid v1.6.0
26+
github.com/nutanix-cloud-native/prism-go-client v0.5.0
27+
- github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.0.1-beta.1
28+
+ github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
29+
github.com/onsi/ginkgo/v2 v2.19.1
30+
github.com/onsi/gomega v1.34.0
31+
github.com/pkg/errors v0.9.1
32+
@@ -113,9 +113,9 @@ require (
33+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
34+
github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.1-beta.2 // indirect
35+
github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.0.2-beta.1 // indirect
36+
- github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.1-beta.1 // indirect
37+
+ github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.3-alpha.2.0.20241207000612-2252cbaf6ae9 // indirect
38+
github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 v4.0.2-alpha.3 // indirect
39+
- github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.1-beta.1 // indirect
40+
+ github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.3-alpha.1.0.20241207000612-2252cbaf6ae9 // indirect
41+
github.com/oklog/ulid v1.3.1 // indirect
42+
github.com/opencontainers/go-digest v1.0.0 // indirect
43+
github.com/opencontainers/image-spec v1.0.2 // indirect
44+
@@ -178,6 +178,25 @@ require (
45+
)
46+
47+
replace (
48+
+ github.com/nutanix/ntnx-api-golang-clients/aiops-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/aiops-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
49+
+ github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
50+
+ github.com/nutanix/ntnx-api-golang-clients/datapolicies-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/datapolicies-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
51+
+ github.com/nutanix/ntnx-api-golang-clients/dataprotection-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/dataprotection-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
52+
+ github.com/nutanix/ntnx-api-golang-clients/files-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/files-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
53+
+ github.com/nutanix/ntnx-api-golang-clients/iam-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/iam-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
54+
+ github.com/nutanix/ntnx-api-golang-clients/lcm-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/lcm-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
55+
+ github.com/nutanix/ntnx-api-golang-clients/licensing-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/licensing-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
56+
+ github.com/nutanix/ntnx-api-golang-clients/lifecycle-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/lifecycle-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
57+
+ github.com/nutanix/ntnx-api-golang-clients/microseg-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/microseg-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
58+
+ github.com/nutanix/ntnx-api-golang-clients/monitoring-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/monitoring-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
59+
+ github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
60+
+ github.com/nutanix/ntnx-api-golang-clients/objects-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/objects-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
61+
+ github.com/nutanix/ntnx-api-golang-clients/opsmgmt-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/opsmgmt-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
62+
+ github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
63+
+ github.com/nutanix/ntnx-api-golang-clients/security-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/security-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9
64+
+ github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 v4.0.2-alpha.3.0.20241207000612-2252cbaf6ae9
65+
+ github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 => github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.3-alpha.1.0.20241207000612-2252cbaf6ae9
66+
+ go.keploy.io/server v0.8.6 => go.keploy.io/server v0.7.19
67+
// CVE fixes for https://avd.aquasec.com/nvd/2024/cve-2024-45338
68+
golang.org/x/net => golang.org/x/net v0.33.0
69+
sigs.k8s.io/kind v0.20.0 => sigs.k8s.io/kind v0.22.0
70+
diff --git a/go.sum b/go.sum
71+
index e1c1282..8efb7d8 100644
72+
--- a/go.sum
73+
+++ b/go.sum
74+
@@ -273,18 +273,18 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
75+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
76+
github.com/nutanix-cloud-native/prism-go-client v0.5.0 h1:aSNuKDOK7+q676MQyetYXcySY41IjSvN2UmrDIU3+6s=
77+
github.com/nutanix-cloud-native/prism-go-client v0.5.0/go.mod h1:QhLX+sEep0cStzHVYU6mPgIlnA8U3DySskagrbDprRk=
78+
-github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.1-beta.2 h1:s1u5/GEw3mTZakepJoTD1OvPVU1YuioRxmKZin+W99s=
79+
-github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.1-beta.2/go.mod h1:sd4Fnk6MVfEDVY+8WyRoQTmLhi2SgZ3riySWErVHf8E=
80+
-github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.0.2-beta.1 h1:PvZQwYhhJtxmzLpnzEhHTpp2fV6woc6W65PHGsHzVfs=
81+
-github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.0.2-beta.1/go.mod h1:+eZgV1+xL/r84qmuFSVt5R8OFRO70rEz92jOnVgJNco=
82+
-github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.1-beta.1 h1:hvy3QCc2SgVidYxTq0rRPOazJOt1PP8A86kW7j6sywU=
83+
-github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.1-beta.1/go.mod h1:Yhk+xD4mN90OKEHnk5ARf97CX5p4+MEC/B/YIVoZeZ0=
84+
-github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 v4.0.2-alpha.3 h1:K3I9YtqKcKKxSL4+tcxnFeLOoaptiVlpsOJ9Xzq3shM=
85+
-github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 v4.0.2-alpha.3/go.mod h1:kz3gO87xtWnPOCP2kN7yw5LvCDVRnvg8BOWL7CarqXA=
86+
-github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.1-beta.1 h1:XuTRvYu1kiNjdXOYVwyjhKlFWyo9nMit6GsOYV8+5Cg=
87+
-github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.1-beta.1/go.mod h1:CaWm4GFpAjQQDc6YXl/dUDrHpuW54h8j6Cj7EslE4Qk=
88+
-github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.0.1-beta.1 h1:VJSaQDnnYeNEk1mkQqEbt573OdM62+5s/B0e9kszdas=
89+
-github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.0.1-beta.1/go.mod h1:Z+RKLwsHYxAcFbZPy2ft3QAK9kBPt9bQdqXSp7eYWkY=
90+
+github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9 h1:GCooUKOZTVzfQQqwajshQql4iZjT8X30Mds7XjdxtWU=
91+
+github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9/go.mod h1:sd4Fnk6MVfEDVY+8WyRoQTmLhi2SgZ3riySWErVHf8E=
92+
+github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9 h1:UahC8a3sJaHa3f+3RPhBqLRlsU3D4wah2INqfvSeaIk=
93+
+github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9/go.mod h1:+eZgV1+xL/r84qmuFSVt5R8OFRO70rEz92jOnVgJNco=
94+
+github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9 h1:1hA7q+ntHsVvCu4BYNZKkFa951cW3msoJzWli2brqXY=
95+
+github.com/nutanix/ntnx-api-golang-clients/prism-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9/go.mod h1:Yhk+xD4mN90OKEHnk5ARf97CX5p4+MEC/B/YIVoZeZ0=
96+
+github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 v4.0.2-alpha.3.0.20241207000612-2252cbaf6ae9 h1:dePt/6Pqgslpx+waJZPsV6xtHDblSSnZI/L8KzkbV2g=
97+
+github.com/nutanix/ntnx-api-golang-clients/storage-go-client/v4 v4.0.2-alpha.3.0.20241207000612-2252cbaf6ae9/go.mod h1:kz3gO87xtWnPOCP2kN7yw5LvCDVRnvg8BOWL7CarqXA=
98+
+github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.3-alpha.1.0.20241207000612-2252cbaf6ae9 h1:WI+TG/6onquONMA+KgjJgmnN7UniddbvASlgzWYCOAw=
99+
+github.com/nutanix/ntnx-api-golang-clients/vmm-go-client/v4 v4.0.3-alpha.1.0.20241207000612-2252cbaf6ae9/go.mod h1:CaWm4GFpAjQQDc6YXl/dUDrHpuW54h8j6Cj7EslE4Qk=
100+
+github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9 h1:firnnSyEDSDktIWnIG1geYf5SeJJ67KBclY2UCCEKKA=
101+
+github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.0.2-0.20241207000612-2252cbaf6ae9/go.mod h1:Z+RKLwsHYxAcFbZPy2ft3QAK9kBPt9bQdqXSp7eYWkY=
102+
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
103+
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
104+
github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=
105+
@@ -389,8 +389,8 @@ go.etcd.io/etcd/raft/v3 v3.5.10 h1:cgNAYe7xrsrn/5kXMSaH8kM/Ky8mAdMqGOxyYwpP0LA=
106+
go.etcd.io/etcd/raft/v3 v3.5.10/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc=
107+
go.etcd.io/etcd/server/v3 v3.5.10 h1:4NOGyOwD5sUZ22PiWYKmfxqoeh72z6EhYjNosKGLmZg=
108+
go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo=
109+
-go.keploy.io/server v0.8.6 h1:czE9jaliyAkMMJcYnMPNuu6tun7UgwFbokxEG95vLN4=
110+
-go.keploy.io/server v0.8.6/go.mod h1:t7BPuZQSiC3PNHZ9dbn3e3VB61HNWwiqVmaRujfDFUg=
111+
+go.keploy.io/server v0.7.19 h1:roOV4xc4naeIeLiODuHZ2C6W//PBLCuBJtzekP/Cjhk=
112+
+go.keploy.io/server v0.7.19/go.mod h1:C+mJoKtdGcBY9bLziNnWsfhvc+9CJ3mDm5kzhnmPnUw=
113+
go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
114+
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
115+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
116+
--
117+
2.49.0
118+

0 commit comments

Comments
 (0)