Add SPIRE entries to sysdump

This adds an export of the SPIRE server entries to the sysdump.
This can be used to detect any initial Cilium access entry issues
as well as any sync issues with the operator.

Signed-off-by: Maartje Eyskens <[email protected]>

sysdump/constants.go

@@ -33,6 +33,7 @@ const (
 	hubbleRelayContainerName           = defaults.RelayContainerName
 	hubbleRelayDeploymentName          = defaults.RelayDeploymentName
 	hubbleUIDeploymentName             = defaults.HubbleUIDeploymentName
+	spireServerContainerName           = "spire-server"
 	redacted                           = "XXXXXX"
 )
 
@@ -51,6 +52,7 @@ const (
 	ciliumSPIREAgentConfigMapFileName        = "cilium-spire-agent-configmap-<ts>.yaml"
 	ciliumSPIREServerStatefulSetFileName     = "cilium-spire-server-statefulset-<ts>.yaml"
 	ciliumSPIREServerConfigMapFileName       = "cilium-spire-server-configmap-<ts>.yaml"
+	ciliumSPIREServerEntriesFileName         = "cilium-spire-server-entries-%s-<ts>.json"
 	ciliumIngressesFileName                  = "ciliumingresses-<ts>.yaml"
 	ciliumEgressNATPoliciesFileName          = "ciliumegressnatpolicies-<ts>.yaml"
 	ciliumEgressGatewayPoliciesFileName      = "ciliumegressgatewaypolicies-<ts>.yaml"

sysdump/sysdump.go

@@ -1565,6 +1565,23 @@ func (c *Collector) getSPIRETasks() []Task {
 				return nil
 			},
 		},
+		{
+			CreatesSubtasks: true,
+			Description:     "Collecting the Cilium SPIRE server identity entries",
+			Quick:           false,
+			Task: func(ctx context.Context) error {
+				p, err := c.Client.ListPods(ctx, c.Options.CiliumSPIRENamespace, metav1.ListOptions{
+					LabelSelector: c.Options.CiliumSPIREServerLabelSelector,
+				})
+				if err != nil {
+					return fmt.Errorf("failed to get identity entries from Cilium SPIRE server pods")
+				}
+				if err := c.submitSpireEntriesTasks(FilterPods(p, c.NodeList)); err != nil {
+					return fmt.Errorf("failed to collect identity entries from Cilium SPIRE server pods")
+				}
+				return nil
+			},
+		},
 	}
 }
 
@@ -1916,6 +1933,39 @@ func (c *Collector) submitHubbleFlowsTasks(_ context.Context, pods []*corev1.Pod
 	return nil
 }
 
+func (c *Collector) submitSpireEntriesTasks(pods []*corev1.Pod) error {
+	for _, p := range pods {
+		p := p
+		if err := c.Pool.Submit(fmt.Sprintf("spire-entries-"+p.Name), func(ctx context.Context) error {
+			p, containerName, cleanupFunc, err := c.ensureExecTarget(ctx, p, spireServerContainerName)
+			if err != nil {
+				return fmt.Errorf("failed to pick exec target: %w", err)
+			}
+			defer func() {
+				err := cleanupFunc(ctx)
+				if err != nil {
+					c.logWarn("Failed to clean up exec target: %v", err)
+				}
+			}()
+
+			command := []string{"/opt/spire/bin/spire-server", "entry", "show", "-output", "json"}
+			o, err := c.Client.ExecInPod(ctx, p.Namespace, p.Name, containerName, command)
+			if err != nil {
+				return fmt.Errorf("failed to collect 'spire-server' output for %q in namespace %q: %w", p.Name, p.Namespace, err)
+			}
+
+			if err := c.WriteBytes(fmt.Sprintf(ciliumSPIREServerEntriesFileName, p.Name), o.Bytes()); err != nil {
+				return fmt.Errorf("failed to write spireserver stdout for %q in namespace %q: %w", p.Name, p.Namespace, err)
+			}
+
+			return nil
+		}); err != nil {
+			return fmt.Errorf("failed to submit SPIRE entries task for %q: %w", p.Name, err)
+		}
+	}
+	return nil
+}
+
 func extractGopsPID(output string) (string, error) {
 	entries := strings.Split(output, "\n")
 	for _, entry := range entries {