Use dynamic path for installer logs in V3 (#3240)

* Use app slug for logs path in V3

Signed-off-by: Steven Crespo <[email protected]>

* f

Signed-off-by: Steven Crespo <[email protected]>

---------

Signed-off-by: Steven Crespo <[email protected]>

Author: screspod

cmd/installer/goods/support/host-support-bundle.tmpl.yaml

@@ -287,7 +287,7 @@ spec:
       args: [ "sysinfo" ]
   - copy:
       collectorName: installer-logs
-      path: /var/log/embedded-cluster/*.log
+      path: {{ .LogsDir }}/*.log
   - copy:
       collectorName: installer-logs-old
       path: {{ .DataDir }}/logs/*.log

pkg/runtimeconfig/defaults.go

@@ -78,18 +78,33 @@ func KotsadmNamespace(ctx context.Context, kcli client.Client) (string, error) {
 	return namespace, nil
 }
 
-// EmbeddedClusterLogsSubDir returns the path to the directory where embedded-cluster logs
+// EmbeddedClusterLogsPath returns the path to the directory where embedded-cluster logs
 // are stored.
+// For V2 compatibility, returns "/var/log/embedded-cluster".
+// For V3 (ENABLE_V3=1), returns "/var/log/{appslug}".
+func EmbeddedClusterLogsPath() string {
+	// Use the app slug for V3 installations
+	if os.Getenv("ENABLE_V3") == "1" {
+		return filepath.Join("/var/log", AppSlug())
+	}
+	// V2 backwards compatibility
+	return "/var/log/embedded-cluster"
+}
+
+// EmbeddedClusterLogsSubDir returns the path to the directory where embedded-cluster logs
+// are stored and ensures the directory exists.
+// For V2 compatibility, returns "/var/log/embedded-cluster".
+// For V3 (ENABLE_V3=1), returns "/var/log/{appslug}".
 func EmbeddedClusterLogsSubDir() string {
-	path := "/var/log/embedded-cluster"
+	path := EmbeddedClusterLogsPath()
 	if err := os.MkdirAll(path, 0755); err != nil {
 		logrus.Fatalf("unable to create embedded-cluster logs dir: %s", err)
 	}
 	return path
 }
 
-// PathToLog returns the full path to a log file. This function does not check
-// if the file exists.
+// PathToLog returns the full path to a log file and ensures the parent directory exists.
+// This function does not check if the file itself exists.
 func PathToLog(name string) string {
 	return filepath.Join(EmbeddedClusterLogsSubDir(), name)
 }

pkg/runtimeconfig/defaults_test.go

@@ -0,0 +1,43 @@
+package runtimeconfig
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// TestEmbeddedClusterLogsPath tests the log path selection logic.
+func TestEmbeddedClusterLogsPath(t *testing.T) {
+	tests := []struct {
+		name     string
+		enableV3 string
+		want     string
+	}{
+		{
+			name:     "V2 returns static path",
+			enableV3: "",
+			want:     "/var/log/embedded-cluster",
+		},
+		{
+			name:     "V2 with ENABLE_V3=0 returns static path",
+			enableV3: "0",
+			want:     "/var/log/embedded-cluster",
+		},
+		{
+			name:     "V3 returns dynamic path with app slug",
+			enableV3: "1",
+			want:     filepath.Join("/var/log", AppSlug()),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Setenv("ENABLE_V3", tt.enableV3)
+
+			got := EmbeddedClusterLogsPath()
+
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}

pkg/support/materialize.go

@@ -17,6 +17,7 @@ type TemplateData struct {
 	DataDir          string
 	K0sDataDir       string
 	OpenEBSDataDir   string
+	LogsDir          string
 	IsAirgap         bool
 	ReplicatedAppURL string
 	ProxyRegistryURL string
@@ -36,6 +37,7 @@ func MaterializeSupportBundleSpec(rc runtimeconfig.RuntimeConfig, isAirgap bool)
 		DataDir:          rc.EmbeddedClusterHomeDirectory(),
 		K0sDataDir:       rc.EmbeddedClusterK0sSubDir(),
 		OpenEBSDataDir:   rc.EmbeddedClusterOpenEBSLocalSubDir(),
+		LogsDir:          runtimeconfig.EmbeddedClusterLogsPath(),
 		IsAirgap:         isAirgap,
 		ReplicatedAppURL: netutils.MaybeAddHTTPS(domains.ReplicatedAppDomain),
 		ProxyRegistryURL: netutils.MaybeAddHTTPS(domains.ProxyRegistryDomain),

tests/dryrun/install_test.go

@@ -117,6 +117,10 @@ func testDefaultInstallationImpl(t *testing.T) {
 		"KUBECONFIG": "/var/lib/embedded-cluster/k0s/pki/admin.conf",
 	})
 
+	// --- validate log directory (V2 static path) --- //
+	logDir := runtimeconfig.EmbeddedClusterLogsSubDir()
+	assert.Equal(t, "/var/log/embedded-cluster", logDir, "V2 should use static log directory")
+
 	// --- validate commands --- //
 	// Get expected hostname to validate it's included in the kubelet args
 	expectedHostname, err := nodeutil.GetHostname("")

tests/dryrun/v3_install_test.go

@@ -111,6 +111,10 @@ func validateHappyPathOnline(t *testing.T, hcli *helm.MockClient) {
 	assert.Equal(t, int64(0), in.Spec.AirgapUncompressedSize, "Installation.Spec.AirgapUncompressedSize should be 0 for online installations")
 	assert.Equal(t, "80-32767", in.Spec.RuntimeConfig.Network.NodePortRange, "Installation.Spec.RuntimeConfig.Network.NodePortRange should be set to default range")
 
+	// Validate log directory (V3 dynamic path based on app slug)
+	logDir := runtimeconfig.EmbeddedClusterLogsSubDir()
+	assert.Equal(t, "/var/log/fake-app-slug", logDir, "V3 should use dynamic log directory based on app slug")
+
 	// Validate that HTTP collectors are present in host preflight spec for online installations
 	assertCollectors(t, dr.HostPreflightSpec.Collectors, map[string]struct {
 		match    func(*troubleshootv1beta2.HostCollect) bool