From 745bc71ec9d69efe1e112ff2ee42098ae6070121 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Sat, 1 Mar 2025 15:26:28 +0100 Subject: [PATCH] fix(vmware): fallback on single host clusters when no cluster is detected (#521) * chore(k8s): Replace version in k8s manifests * fix(vmware): fallback on single host clusters when no cluster is detected --------- Co-authored-by: src-csm <199741225+src-csm@users.noreply.github.com> --- internal/source/vmware/vmware.go | 19 ++++++++++++++----- k8s/cronjob.yaml | 2 +- k8s/cronjob_with_cert.yaml | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/internal/source/vmware/vmware.go b/internal/source/vmware/vmware.go index fe31f00..d94845f 100644 --- a/internal/source/vmware/vmware.go +++ b/internal/source/vmware/vmware.go @@ -269,11 +269,20 @@ func (vc *VmwareSource) CreateClusterDataCenterRelation( finder.SetDatacenter(dc) clusters, err := finder.ClusterComputeResourceList(ctx, "*") if err != nil { - return fmt.Errorf( - "finder failed finding clusters for datacenter %s: %s", - dc.InventoryPath, - err, - ) + // fallback on single host clusters + clusters, err := finder.ComputeResourceList(ctx, "*") + + if err != nil { + return fmt.Errorf( + "finder failed finding clusters for datacenter %s: %s", + dc.InventoryPath, + err, + ) + } + + for _, cluster := range clusters { + vc.Cluster2Datacenter[cluster.Reference().Value] = dc.Reference().Value + } } for _, cluster := range clusters { vc.Cluster2Datacenter[cluster.Reference().Value] = dc.Reference().Value diff --git a/k8s/cronjob.yaml b/k8s/cronjob.yaml index e6d90f8..1a90f4d 100644 --- a/k8s/cronjob.yaml +++ b/k8s/cronjob.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: netbox-ssot - image: ghcr.io/src-doo/netbox-ssot:v1.10.4 + image: ghcr.io/src-doo/netbox-ssot:v1.11.0 imagePullPolicy: Always resources: limits: diff --git a/k8s/cronjob_with_cert.yaml b/k8s/cronjob_with_cert.yaml index 9844d00..e4bdb14 100644 --- a/k8s/cronjob_with_cert.yaml +++ b/k8s/cronjob_with_cert.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: netbox-ssot - image: ghcr.io/src-doo/netbox-ssot:v1.10.4 + image: ghcr.io/src-doo/netbox-ssot:v1.11.0 imagePullPolicy: Always resources: limits: