Update installer and preview to support new agent-smith config

Co-authored-by: Ona <[email protected]>

Author: kylos101

components/ee/agent-smith/example-config.json

@@ -57,6 +57,6 @@
         "enabled": true,
         "scanInterval": "5m",
         "maxFileSize": 1024,
-        "workingArea": "/var/gitpod/workspaces"
+        "workingArea": "/mnt/workingarea-mk2"
     }
 }

dev/preview/workflow/preview/deploy-gitpod.sh

@@ -464,6 +464,14 @@ yq w -i "${INSTALLER_CONFIG_PATH}" experimental.workspace.networkLimits.bucketSi
 #
 yq w -i "${INSTALLER_CONFIG_PATH}" experimental.webapp.server.gcpProfilerEnabled "true"
 
+#
+# Enable agent-smith filesystem scanning
+# (uncomment if needed, we don't use agent-smith by default in previews)
+# yq w -i "${INSTALLER_CONFIG_PATH}" experimental.agentsmith.filesystemScanning.enabled "true"
+# yq w -i "${INSTALLER_CONFIG_PATH}" experimental.agentsmith.filesystemScanning.scanInterval "5m"
+# yq w -i "${INSTALLER_CONFIG_PATH}" experimental.agentsmith.filesystemScanning.maxFileSize "1024"
+# yq w -i "${INSTALLER_CONFIG_PATH}" experimental.agentsmith.filesystemScanning.workingArea "/mnt/workingarea-mk2"
+
 log_success "Generated config at $INSTALLER_CONFIG_PATH"
 
 # ========

install/installer/pkg/components/agent-smith/configmap.go

@@ -6,6 +6,7 @@ package agentsmith
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/gitpod-io/gitpod/agent-smith/pkg/config"
 	"github.com/gitpod-io/gitpod/common-go/baseserver"
@@ -42,6 +43,13 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	if ctx.Config.Components != nil && ctx.Config.Components.AgentSmith != nil {
 		ascfg.Config = *ctx.Config.Components.AgentSmith
 		ascfg.Config.KubernetesNamespace = ctx.Namespace
+
+		// Set working area path if filesystem scanning is enabled
+		if ascfg.Config.FilesystemScanning != nil && ascfg.Config.FilesystemScanning.Enabled {
+			ascfg.Config.FilesystemScanning.Enabled = true
+			ascfg.Config.FilesystemScanning.WorkingArea = ContainerWorkingAreaMk2
+			ascfg.Config.FilesystemScanning.ScanInterval = config.Duration{Duration: 5 * time.Minute}
+		}
 	}
 
 	fc, err := common.ToJSONString(ascfg)

install/installer/pkg/components/agent-smith/constants.go

@@ -6,4 +6,8 @@ package agentsmith
 
 const (
 	Component = "agent-smith"
+
+	// Working area paths - must match ws-daemon constants
+	HostWorkingAreaMk2      = "/var/gitpod/workspaces-mk2"
+	ContainerWorkingAreaMk2 = "/mnt/workingarea-mk2"
 )

install/installer/pkg/components/agent-smith/daemonset.go

@@ -74,6 +74,11 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 								MountPath: "/wsman-certs",
 								ReadOnly:  true,
 							},
+							{
+								Name:      "working-area",
+								MountPath: ContainerWorkingAreaMk2,
+								ReadOnly:  true,
+							},
 							common.CAVolumeMount(),
 						},
 						Env: common.CustomizeEnvvar(ctx, Component, common.MergeEnv(
@@ -103,6 +108,15 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 								},
 							},
 						},
+						{
+							Name: "working-area",
+							VolumeSource: corev1.VolumeSource{
+								HostPath: &corev1.HostPathVolumeSource{
+									Path: HostWorkingAreaMk2,
+									Type: func() *corev1.HostPathType { t := corev1.HostPathDirectory; return &t }(),
+								},
+							},
+						},
 						common.CAVolume(),
 					},
 					Tolerations: []corev1.Toleration{