From bdcc0ad8d210cd6cf3656bd64023273dc75b71bf Mon Sep 17 00:00:00 2001 From: Abhay Aggrawal Date: Tue, 18 Nov 2025 14:16:57 +0530 Subject: [PATCH] fix(bumpup): Pism-Go-Client v0.6.0, CCM v0.6.0 (#625) --- Makefile | 1 - controllers/helpers_test.go | 5 +- go.mod | 3 +- go.sum | 4 +- mocks/converged/clusters.go | 139 +++++++++++++++--- scripts/ccm_nutanix_update.sh | 2 +- templates/ccm/nutanix-ccm.yaml | 2 +- templates/cluster-template-csi.yaml | 2 +- templates/cluster-template-csi3.yaml | 2 +- .../cluster-template-failure-domains.yaml | 2 +- templates/cluster-template-image-lookup.yaml | 2 +- templates/cluster-template-topology.yaml | 2 +- templates/cluster-template.yaml | 2 +- .../infrastructure-nutanix/ccm-update.yaml | 2 +- 14 files changed, 131 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index 1c2c0d9043..2d8e99c103 100644 --- a/Makefile +++ b/Makefile @@ -368,7 +368,6 @@ mocks: ## Generate mocks for the project mockgen -destination=mocks/k8sclient/informer.go -package=mockk8sclient k8s.io/client-go/informers/core/v1 ConfigMapInformer,SecretInformer mockgen -destination=mocks/k8sclient/lister.go -package=mockk8sclient k8s.io/client-go/listers/core/v1 SecretLister,SecretNamespaceLister mockgen -destination=mocks/k8sapimachinery/interfaces.go -package=mockmeta k8s.io/apimachinery/pkg/api/meta RESTMapper,RESTScope - mockgen -destination=mocks/nutanix/v3.go -package=mocknutanixv3 github.com/nutanix-cloud-native/prism-go-client/v3 Service mockgen -destination=mocks/converged/vms.go -package=mockconverged github.com/nutanix-cloud-native/prism-go-client/converged VMs mockgen -destination=mocks/converged/operation.go -package=mockconverged github.com/nutanix-cloud-native/prism-go-client/converged Operation mockgen -destination=mocks/converged/anti_affinity_policies.go -package=mockconverged github.com/nutanix-cloud-native/prism-go-client/converged AntiAffinityPolicies diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go index a9490578e9..1cc7256902 100644 --- a/controllers/helpers_test.go +++ b/controllers/helpers_test.go @@ -2513,7 +2513,7 @@ type MockConvergedClientWrapper struct { Client *v4Converged.Client MockAntiAffinityPolicies *mockconverged.MockAntiAffinityPolicies[policyModels.VmAntiAffinityPolicy] - MockClusters *mockconverged.MockClusters[clusterModels.Cluster, clusterModels.VirtualGpuProfile, clusterModels.PhysicalGpuProfile] + MockClusters *mockconverged.MockClusters[clusterModels.Cluster, clusterModels.VirtualGpuProfile, clusterModels.PhysicalGpuProfile, clusterModels.Host] MockCategories *mockconverged.MockCategories[prismModels.Category] MockImages *mockconverged.MockImages[imageModels.Image] MockStorageContainers *mockconverged.MockStorageContainers[clusterModels.StorageContainer] @@ -2526,7 +2526,7 @@ type MockConvergedClientWrapper struct { // NewMockConvergedClient creates a new mock converged client func NewMockConvergedClient(ctrl *gomock.Controller) *MockConvergedClientWrapper { mockAntiAffinityPolicies := mockconverged.NewMockAntiAffinityPolicies[policyModels.VmAntiAffinityPolicy](ctrl) - mockClusters := mockconverged.NewMockClusters[clusterModels.Cluster, clusterModels.VirtualGpuProfile, clusterModels.PhysicalGpuProfile](ctrl) + mockClusters := mockconverged.NewMockClusters[clusterModels.Cluster, clusterModels.VirtualGpuProfile, clusterModels.PhysicalGpuProfile, clusterModels.Host](ctrl) mockCategories := mockconverged.NewMockCategories[prismModels.Category](ctrl) mockImages := mockconverged.NewMockImages[imageModels.Image](ctrl) mockStorageContainers := mockconverged.NewMockStorageContainers[clusterModels.StorageContainer](ctrl) @@ -2542,6 +2542,7 @@ func NewMockConvergedClient(ctrl *gomock.Controller) *MockConvergedClientWrapper clusterModels.Cluster, clusterModels.VirtualGpuProfile, clusterModels.PhysicalGpuProfile, + clusterModels.Host, prismModels.Category, imageModels.Image, clusterModels.StorageContainer, diff --git a/go.mod b/go.mod index 1b59fe7ad2..b5327d6b9f 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/nutanix-cloud-native/prism-go-client v0.5.0 + github.com/nutanix-cloud-native/prism-go-client v0.6.0 github.com/nutanix/ntnx-api-golang-clients/volumes-go-client/v4 v4.1.1 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.36.3 @@ -187,7 +187,6 @@ require ( ) replace ( - github.com/nutanix-cloud-native/prism-go-client => github.com/nutanix-cloud-native/prism-go-client v0.5.2-0.20251023040331-ea5df46774dd // CVE fixes for https://avd.aquasec.com/nvd/2024/cve-2024-45338 golang.org/x/net => golang.org/x/net v0.33.0 sigs.k8s.io/kind v0.20.0 => sigs.k8s.io/kind v0.22.0 diff --git a/go.sum b/go.sum index 2245f3f5b7..408f5f64dc 100644 --- a/go.sum +++ b/go.sum @@ -268,8 +268,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nutanix-cloud-native/prism-go-client v0.5.2-0.20251023040331-ea5df46774dd h1:UhfmnlEC/l7Ll+bzXkPF9J+IA0mJPbMWgPpzzZnJYGM= -github.com/nutanix-cloud-native/prism-go-client v0.5.2-0.20251023040331-ea5df46774dd/go.mod h1:MGMzqONi2f9aZHeWwQYwL5j/r6Kxv56g6VIvkVFIlbU= +github.com/nutanix-cloud-native/prism-go-client v0.6.0 h1:aNWmQaVZnjfY7g5hxfBv0t+bpA4HlTNGHMU1NJeXKlA= +github.com/nutanix-cloud-native/prism-go-client v0.6.0/go.mod h1:MGMzqONi2f9aZHeWwQYwL5j/r6Kxv56g6VIvkVFIlbU= github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.1.1 h1:4ZkiY4yavcy3Suwi5ntofjh3mzL3muTCVs9OPkZ940k= github.com/nutanix/ntnx-api-golang-clients/clustermgmt-go-client/v4 v4.1.1/go.mod h1:sd4Fnk6MVfEDVY+8WyRoQTmLhi2SgZ3riySWErVHf8E= github.com/nutanix/ntnx-api-golang-clients/networking-go-client/v4 v4.1.1 h1:XqAQX+sT8EZBRoJbhBm2jpjYGnHd//mjx1PjQI+zIGQ= diff --git a/mocks/converged/clusters.go b/mocks/converged/clusters.go index e4a8b7afbb..c34ec6816e 100644 --- a/mocks/converged/clusters.go +++ b/mocks/converged/clusters.go @@ -18,31 +18,31 @@ import ( ) // MockClusters is a mock of Clusters interface. -type MockClusters[Cluster any, VirtualGpuProfile any, PhysicalGpuProfile any] struct { +type MockClusters[Cluster any, VirtualGpuProfile any, PhysicalGpuProfile any, Host any] struct { ctrl *gomock.Controller - recorder *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile] + recorder *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host] isgomock struct{} } // MockClustersMockRecorder is the mock recorder for MockClusters. -type MockClustersMockRecorder[Cluster any, VirtualGpuProfile any, PhysicalGpuProfile any] struct { - mock *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile] +type MockClustersMockRecorder[Cluster any, VirtualGpuProfile any, PhysicalGpuProfile any, Host any] struct { + mock *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host] } // NewMockClusters creates a new mock instance. -func NewMockClusters[Cluster any, VirtualGpuProfile any, PhysicalGpuProfile any](ctrl *gomock.Controller) *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile] { - mock := &MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]{ctrl: ctrl} - mock.recorder = &MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile]{mock} +func NewMockClusters[Cluster any, VirtualGpuProfile any, PhysicalGpuProfile any, Host any](ctrl *gomock.Controller) *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host] { + mock := &MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]{ctrl: ctrl} + mock.recorder = &MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) EXPECT() *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile] { +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) EXPECT() *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host] { return m.recorder } // Get mocks base method. -func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) Get(ctx context.Context, uuid string) (*Cluster, error) { +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) Get(ctx context.Context, uuid string) (*Cluster, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Get", ctx, uuid) ret0, _ := ret[0].(*Cluster) @@ -51,13 +51,28 @@ func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) Get(ctx c } // Get indicates an expected call of Get. -func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) Get(ctx, uuid any) *gomock.Call { +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) Get(ctx, uuid any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile])(nil).Get), ctx, uuid) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).Get), ctx, uuid) +} + +// GetClusterHost mocks base method. +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) GetClusterHost(ctx context.Context, clusterUuid, hostId string) (*Host, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetClusterHost", ctx, clusterUuid, hostId) + ret0, _ := ret[0].(*Host) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetClusterHost indicates an expected call of GetClusterHost. +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) GetClusterHost(ctx, clusterUuid, hostId any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClusterHost", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).GetClusterHost), ctx, clusterUuid, hostId) } // List mocks base method. -func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) List(ctx context.Context, opts ...converged.ODataOption) ([]Cluster, error) { +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) List(ctx context.Context, opts ...converged.ODataOption) ([]Cluster, error) { m.ctrl.T.Helper() varargs := []any{ctx} for _, a := range opts { @@ -70,14 +85,54 @@ func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) List(ctx } // List indicates an expected call of List. -func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) List(ctx any, opts ...any) *gomock.Call { +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) List(ctx any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile])(nil).List), varargs...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).List), varargs...) +} + +// ListAllHosts mocks base method. +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListAllHosts(ctx context.Context, opts ...converged.ODataOption) ([]Host, error) { + m.ctrl.T.Helper() + varargs := []any{ctx} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "ListAllHosts", varargs...) + ret0, _ := ret[0].([]Host) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListAllHosts indicates an expected call of ListAllHosts. +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListAllHosts(ctx any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListAllHosts", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).ListAllHosts), varargs...) +} + +// ListClusterHosts mocks base method. +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListClusterHosts(ctx context.Context, clusterUuid string, opts ...converged.ODataOption) ([]Host, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, clusterUuid} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "ListClusterHosts", varargs...) + ret0, _ := ret[0].([]Host) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListClusterHosts indicates an expected call of ListClusterHosts. +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListClusterHosts(ctx, clusterUuid any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, clusterUuid}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListClusterHosts", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).ListClusterHosts), varargs...) } // ListClusterPhysicalGPUs mocks base method. -func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) ListClusterPhysicalGPUs(ctx context.Context, clusterUuid string, opts ...converged.ODataOption) ([]PhysicalGpuProfile, error) { +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListClusterPhysicalGPUs(ctx context.Context, clusterUuid string, opts ...converged.ODataOption) ([]PhysicalGpuProfile, error) { m.ctrl.T.Helper() varargs := []any{ctx, clusterUuid} for _, a := range opts { @@ -90,14 +145,14 @@ func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) ListClust } // ListClusterPhysicalGPUs indicates an expected call of ListClusterPhysicalGPUs. -func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) ListClusterPhysicalGPUs(ctx, clusterUuid any, opts ...any) *gomock.Call { +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListClusterPhysicalGPUs(ctx, clusterUuid any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx, clusterUuid}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListClusterPhysicalGPUs", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile])(nil).ListClusterPhysicalGPUs), varargs...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListClusterPhysicalGPUs", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).ListClusterPhysicalGPUs), varargs...) } // ListClusterVirtualGPUs mocks base method. -func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) ListClusterVirtualGPUs(ctx context.Context, clusterUuid string, opts ...converged.ODataOption) ([]VirtualGpuProfile, error) { +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListClusterVirtualGPUs(ctx context.Context, clusterUuid string, opts ...converged.ODataOption) ([]VirtualGpuProfile, error) { m.ctrl.T.Helper() varargs := []any{ctx, clusterUuid} for _, a := range opts { @@ -110,14 +165,52 @@ func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) ListClust } // ListClusterVirtualGPUs indicates an expected call of ListClusterVirtualGPUs. -func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) ListClusterVirtualGPUs(ctx, clusterUuid any, opts ...any) *gomock.Call { +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) ListClusterVirtualGPUs(ctx, clusterUuid any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, clusterUuid}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListClusterVirtualGPUs", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).ListClusterVirtualGPUs), varargs...) +} + +// NewAllHostsIterator mocks base method. +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) NewAllHostsIterator(ctx context.Context, opts ...converged.ODataOption) converged.Iterator[Host] { + m.ctrl.T.Helper() + varargs := []any{ctx} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "NewAllHostsIterator", varargs...) + ret0, _ := ret[0].(converged.Iterator[Host]) + return ret0 +} + +// NewAllHostsIterator indicates an expected call of NewAllHostsIterator. +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) NewAllHostsIterator(ctx any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewAllHostsIterator", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).NewAllHostsIterator), varargs...) +} + +// NewClusterHostsIterator mocks base method. +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) NewClusterHostsIterator(ctx context.Context, clusterUuid string, opts ...converged.ODataOption) converged.Iterator[Host] { + m.ctrl.T.Helper() + varargs := []any{ctx, clusterUuid} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "NewClusterHostsIterator", varargs...) + ret0, _ := ret[0].(converged.Iterator[Host]) + return ret0 +} + +// NewClusterHostsIterator indicates an expected call of NewClusterHostsIterator. +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) NewClusterHostsIterator(ctx, clusterUuid any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx, clusterUuid}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListClusterVirtualGPUs", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile])(nil).ListClusterVirtualGPUs), varargs...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewClusterHostsIterator", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).NewClusterHostsIterator), varargs...) } // NewIterator mocks base method. -func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) NewIterator(ctx context.Context, opts ...converged.ODataOption) converged.Iterator[Cluster] { +func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) NewIterator(ctx context.Context, opts ...converged.ODataOption) converged.Iterator[Cluster] { m.ctrl.T.Helper() varargs := []any{ctx} for _, a := range opts { @@ -129,8 +222,8 @@ func (m *MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) NewIterat } // NewIterator indicates an expected call of NewIterator. -func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile]) NewIterator(ctx any, opts ...any) *gomock.Call { +func (mr *MockClustersMockRecorder[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host]) NewIterator(ctx any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewIterator", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile])(nil).NewIterator), varargs...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewIterator", reflect.TypeOf((*MockClusters[Cluster, VirtualGpuProfile, PhysicalGpuProfile, Host])(nil).NewIterator), varargs...) } diff --git a/scripts/ccm_nutanix_update.sh b/scripts/ccm_nutanix_update.sh index a732eac672..e397ebf3eb 100755 --- a/scripts/ccm_nutanix_update.sh +++ b/scripts/ccm_nutanix_update.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -NUTANIX_CCM_VERSION=0.3.2 +NUTANIX_CCM_VERSION=0.6.0 NUTANIX_CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller helm repo add nutanix https://nutanix.github.io/helm/ --force-update && helm repo update diff --git a/templates/ccm/nutanix-ccm.yaml b/templates/ccm/nutanix-ccm.yaml index 4e2fbd4faf..4f8ec62439 100644 --- a/templates/ccm/nutanix-ccm.yaml +++ b/templates/ccm/nutanix-ccm.yaml @@ -189,7 +189,7 @@ spec: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: diff --git a/templates/cluster-template-csi.yaml b/templates/cluster-template-csi.yaml index ceefe905db..e3f94cae8b 100644 --- a/templates/cluster-template-csi.yaml +++ b/templates/cluster-template-csi.yaml @@ -200,7 +200,7 @@ data: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: diff --git a/templates/cluster-template-csi3.yaml b/templates/cluster-template-csi3.yaml index eaf447f9bd..46441acb76 100644 --- a/templates/cluster-template-csi3.yaml +++ b/templates/cluster-template-csi3.yaml @@ -200,7 +200,7 @@ data: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: diff --git a/templates/cluster-template-failure-domains.yaml b/templates/cluster-template-failure-domains.yaml index c743162130..d31cd3d8bb 100644 --- a/templates/cluster-template-failure-domains.yaml +++ b/templates/cluster-template-failure-domains.yaml @@ -200,7 +200,7 @@ data: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: diff --git a/templates/cluster-template-image-lookup.yaml b/templates/cluster-template-image-lookup.yaml index 3babf9474f..8afdb23555 100644 --- a/templates/cluster-template-image-lookup.yaml +++ b/templates/cluster-template-image-lookup.yaml @@ -200,7 +200,7 @@ data: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml index e526b7f50b..2ed98c6ad9 100644 --- a/templates/cluster-template-topology.yaml +++ b/templates/cluster-template-topology.yaml @@ -199,7 +199,7 @@ data: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index e2a70b6dae..da0bc2238d 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -200,7 +200,7 @@ data: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: diff --git a/test/e2e/data/infrastructure-nutanix/ccm-update.yaml b/test/e2e/data/infrastructure-nutanix/ccm-update.yaml index d3d9766e18..ca7d276a9e 100644 --- a/test/e2e/data/infrastructure-nutanix/ccm-update.yaml +++ b/test/e2e/data/infrastructure-nutanix/ccm-update.yaml @@ -192,7 +192,7 @@ data: key: node.kubernetes.io/not-ready operator: Exists containers: - - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.5.4}" + - image: "${CCM_REPO=ghcr.io/nutanix-cloud-native/cloud-provider-nutanix/controller}:${CCM_TAG=v0.6.0}" imagePullPolicy: IfNotPresent name: nutanix-cloud-controller-manager env: