From ca2730cd85076d774a898a00bc951b37d9cdd67a Mon Sep 17 00:00:00 2001
From: yuleib <89763818+yuleib@users.noreply.github.com>
Date: Tue, 14 Feb 2023 08:59:03 +0200
Subject: [PATCH] Revert "fix: add check to skip controlplaneinfo in case of
 cloud providers"

---
 .../hostsensorutils/hostsensorgetfrompod.go   | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/core/pkg/hostsensorutils/hostsensorgetfrompod.go b/core/pkg/hostsensorutils/hostsensorgetfrompod.go
index b96f9c22..874d7db3 100644
--- a/core/pkg/hostsensorutils/hostsensorgetfrompod.go
+++ b/core/pkg/hostsensorutils/hostsensorgetfrompod.go
@@ -323,27 +323,24 @@ func (hsh *HostSensorHandler) CollectResources(ctx context.Context) ([]hostsenso
 		res = append(res, kcData...)
 	}
 
-	// GetCloudProviderInfo
-	kcData, err = hsh.GetCloudProviderInfo(ctx)
-	isCloudProvider := (kcData != nil)
+	// GetControlPlaneInfo
+	kcData, err = hsh.GetControlPlaneInfo(ctx)
 	if err != nil {
-		addInfoToMap(CloudProviderInfo, infoMap, err)
+		addInfoToMap(ControlPlaneInfo, infoMap, err)
 		logger.L().Ctx(ctx).Warning(err.Error())
 	}
 	if len(kcData) > 0 {
 		res = append(res, kcData...)
 	}
 
-	// GetControlPlaneInfo
-	if !isCloudProvider { // we retrieve control plane info only if we are not using a cloud provider
-		kcData, err = hsh.GetControlPlaneInfo(ctx)
-		if err != nil {
-			addInfoToMap(ControlPlaneInfo, infoMap, err)
-			logger.L().Ctx(ctx).Warning(err.Error())
-		}
-		if len(kcData) > 0 {
-			res = append(res, kcData...)
-		}
+	// GetCloudProviderInfo
+	kcData, err = hsh.GetCloudProviderInfo(ctx)
+	if err != nil {
+		addInfoToMap(CloudProviderInfo, infoMap, err)
+		logger.L().Ctx(ctx).Warning(err.Error())
+	}
+	if len(kcData) > 0 {
+		res = append(res, kcData...)
 	}
 
 	// GetCNIInfo