Use a namespaces datagatherer to get the cluster ID

Remove obsolete clusteruid package

Signed-off-by: Richard Wall <[email protected]>

Author: wallrj

pkg/agent/run.go

@@ -32,7 +32,6 @@ import (
 
 	"github.com/jetstack/preflight/api"
 	"github.com/jetstack/preflight/pkg/client"
-	"github.com/jetstack/preflight/pkg/clusteruid"
 	"github.com/jetstack/preflight/pkg/datagatherer"
 	"github.com/jetstack/preflight/pkg/datagatherer/k8s"
 	"github.com/jetstack/preflight/pkg/kubeconfig"
@@ -79,28 +78,6 @@ func Run(cmd *cobra.Command, args []string) (returnErr error) {
 		return fmt.Errorf("While evaluating configuration: %v", err)
 	}
 
-	// We need the cluster UID before we progress further so it can be sent along with other data readings
-
-	{
-		restCfg, err := kubeconfig.LoadRESTConfig("")
-		if err != nil {
-			return err
-		}
-
-		clientset, err := kubernetes.NewForConfig(restCfg)
-		if err != nil {
-			return err
-		}
-
-		ctx, err = clusteruid.GetClusterUID(ctx, clientset)
-		if err != nil {
-			return fmt.Errorf("failed to get cluster UID: %v", err)
-		}
-
-		clusterUID := clusteruid.ClusterUIDFromContext(ctx)
-		log.V(logs.Debug).Info("Retrieved cluster UID", "clusterUID", clusterUID)
-	}
-
 	group, gctx := errgroup.WithContext(ctx)
 	defer func() {
 		cancel()

pkg/clusteruid/clusteruid.go

@@ -72,6 +72,19 @@ func extractResourceListFromReading(reading *api.DataReading) ([]*unstructured.U
 	return resources, nil
 }
 
+func extractClusterUIDFromReading(reading *api.DataReading) (string, error) {
+	resources, err := extractResourceListFromReading(reading)
+	if err != nil {
+		return "", err
+	}
+	for _, resource := range resources {
+		if resource.GetName() == "kube-system" {
+			return string(resource.GetUID()), nil
+		}
+	}
+	return "", fmt.Errorf("kube-system namespace UID not found in data reading: %v", reading)
+}
+
 func extractServerVersionFromReading(reading *api.DataReading) (string, error) {
 	data, ok := reading.Data.(*k8s.DiscoveryData)
 	if !ok {
@@ -88,6 +101,7 @@ func ConvertDataReadingsToCyberarkSnapshot(
 	payload api.DataReadingsPost,
 ) (_ *Snapshot, err error) {
 	k8sVersion := ""
+	clusterID := ""
 	resourceData := ResourceData{}
 	for _, reading := range payload.DataReadings {
 		if reading.DataGatherer == "ark/discovery" {
@@ -96,6 +110,12 @@ func ConvertDataReadingsToCyberarkSnapshot(
 				return nil, fmt.Errorf("while extracting server version from data-reading: %s", err)
 			}
 		}
+		if reading.DataGatherer == "ark/namespaces" {
+			clusterID, err = extractClusterUIDFromReading(reading)
+			if err != nil {
+				return nil, fmt.Errorf("while extracting cluster UID from data-reading: %s", err)
+			}
+		}
 		if key, found := gathererNameToresourceDataKeyMap[reading.DataGatherer]; found {
 			var resources []*unstructured.Unstructured
 			resources, err = extractResourceListFromReading(reading)
@@ -108,7 +128,7 @@ func ConvertDataReadingsToCyberarkSnapshot(
 
 	return &Snapshot{
 		AgentVersion:    payload.AgentMetadata.Version,
-		ClusterID:       payload.AgentMetadata.ClusterID,
+		ClusterID:       clusterID,
 		K8SVersion:      k8sVersion,
 		Secrets:         resourceData["secrets"],
 		ServiceAccounts: resourceData["serviceaccounts"],

pkg/clusteruid/clusteruid_test.go

@@ -276,8 +276,7 @@ func TestConvertDataReadingsToCyberarkSnapshot(t *testing.T) {
 	dataReadings := parseDataReadings(t, readGZIP(t, "testdata/example-1/datareadings.json.gz"))
 	snapshot, err := dataupload.ConvertDataReadingsToCyberarkSnapshot(api.DataReadingsPost{
 		AgentMetadata: &api.AgentMetadata{
-			Version:   "test-version",
-			ClusterID: "test-cluster-id",
+			Version: "test-version",
 		},
 		DataReadings: dataReadings,
 	})