Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions controllers/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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)
Expand All @@ -2542,6 +2542,7 @@ func NewMockConvergedClient(ctrl *gomock.Controller) *MockConvergedClientWrapper
clusterModels.Cluster,
clusterModels.VirtualGpuProfile,
clusterModels.PhysicalGpuProfile,
clusterModels.Host,
prismModels.Category,
imageModels.Image,
clusterModels.StorageContainer,
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
139 changes: 116 additions & 23 deletions mocks/converged/clusters.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/ccm_nutanix_update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/ccm/nutanix-ccm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/cluster-template-csi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/cluster-template-csi3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Loading