Merge pull request #1409 from FabianKramm/main

fix: potential nil pointer in telemetry & delete k0s folder

pkg/k0s/k0s.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/ghodss/yaml"
@@ -20,7 +21,16 @@ type k0sCommand struct {
 	Args    []string `json:"args,omitempty"`
 }
 
+const runDir = "/run/k0s"
+
 func StartK0S(ctx context.Context) error {
+	// make sure we delete the contents of /run/k0s
+	dirEntries, _ := os.ReadDir(runDir)
+	for _, entry := range dirEntries {
+		_ = os.RemoveAll(filepath.Join(runDir, entry.Name()))
+	}
+
+	// start k0s binary
 	reader, writer, err := os.Pipe()
 	if err != nil {
 		return err

pkg/telemetry/collect.go

@@ -193,15 +193,18 @@ func (d *DefaultCollector) RecordStatus(ctx context.Context) {
 }
 
 func (d *DefaultCollector) RecordStart(ctx context.Context) {
+	chartInfo := d.getChartInfo(ctx)
 	properties := map[string]interface{}{
 		"vcluster_version":            SyncerVersion,
-		"vcluster_k8s_distro":         d.getChartInfo(ctx).Name,
 		"vcluster_k8s_distro_version": d.getVirtualClusterVersion(),
 		"host_cluster_k8s_version":    d.getHostClusterVersion(),
 		"os_arch":                     runtime.GOOS + "/" + runtime.GOARCH,
-		"helm_values":                 d.getChartInfo(ctx).Values,
 		"creation_method":             d.config.InstanceCreator,
 	}
+	if chartInfo != nil {
+		properties["vcluster_k8s_distro"] = chartInfo.Name
+		properties["helm_values"] = chartInfo.Values
+	}
 
 	// build the event and record
 	propertiesRaw, _ := json.Marshal(properties)
@@ -231,7 +234,10 @@ func (d *DefaultCollector) RecordError(ctx context.Context, severity ErrorSeveri
 
 	// if panic or fatal we add the helm values
 	if severity == PanicSeverity || severity == FatalSeverity {
-		properties["helm_values"] = d.getChartInfo(ctx).Values
+		chartInfo := d.getChartInfo(ctx)
+		if chartInfo != nil {
+			properties["helm_values"] = chartInfo.Values
+		}
 	}
 
 	// build the event and record