f

Author: emosbaugh

.github/workflows/ci.yaml

@@ -290,8 +290,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ./dev/.gocache
-            ./dev/.gomodcache
+            ./dev/build/.gocache
+            ./dev/build/.gomodcache
           key: dryrun-tests-go-cache-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             dryrun-tests-go-cache-

dagger.json

@@ -7,7 +7,9 @@
   "include": [
     "!build",
     "!cmd/installer/goods/bins/**",
+    "cmd/installer/goods/bins/.placeholder",
     "!cmd/installer/goods/internal/bins/**",
+    "cmd/installer/goods/internal/bins/.placeholder",
     "!dagger/embedded-cluster",
     "!dev/build",
     "!local-artifact-mirror/bin",

dagger/cmx.go

@@ -339,6 +339,8 @@ func (i *CmxInstance) CommandWithEnv(
 		"-i", "/root/.ssh/id_rsa",
 		"-o", "StrictHostKeyChecking=no",
 		"-o", "BatchMode=yes",
+		"-o", "ServerAliveInterval=60",
+		"-o", "ServerAliveCountMax=10",
 		"-p", fmt.Sprintf("%d", i.SSHPort),
 		fmt.Sprintf("%s@%s", i.SSHUser, i.SSHEndpoint),
 		remoteCmd,
@@ -382,6 +384,8 @@ func (i *CmxInstance) UploadFile(
 		"-i", "/root/.ssh/id_rsa",
 		"-o", "StrictHostKeyChecking=no",
 		"-o", "BatchMode=yes",
+		"-o", "ServerAliveInterval=60",
+		"-o", "ServerAliveCountMax=10",
 		"-P", fmt.Sprintf("%d", i.SSHPort),
 		tempPath,
 		fmt.Sprintf("%s@%s:%s", i.SSHUser, i.SSHEndpoint, tmpDest),
@@ -677,6 +681,8 @@ func (i *CmxInstance) DownloadFile(
 		"-i", "/root/.ssh/id_rsa",
 		"-o", "StrictHostKeyChecking=no",
 		"-o", "BatchMode=yes",
+		"-o", "ServerAliveInterval=60",
+		"-o", "ServerAliveCountMax=10",
 		"-P", fmt.Sprintf("%d", i.SSHPort),
 		fmt.Sprintf("%s@%s:%s", i.SSHUser, i.SSHEndpoint, remotePath),
 		localPath,

dagger/operator.go

@@ -111,7 +111,12 @@ func (m *EmbeddedCluster) BuildOperatorPackage(
 	melangeFile := m.melangeTemplateOperator(src, ecVersion, kzerosMinorVersion)
 
 	dir := dag.Directory().
-		WithDirectory("operator", src.Directory("operator"))
+		WithDirectory("operator",
+			src.Directory("operator").
+				WithoutDirectory("bin").
+				WithoutDirectory("build").
+				WithoutDirectory("cache"),
+		)
 
 	build := m.chainguard.melangeBuildGo(
 		directoryWithCommonGoFiles(dir, src),

dev/patches/operator-up.yaml

@@ -16,9 +16,9 @@ spec:
           mountPath: /replicatedhq/embedded-cluster # parent of workdir in the container
         env:
         - name: GOCACHE
-          value: /replicatedhq/embedded-cluster/dev/.gocache # from dev volume mount
+          value: /replicatedhq/embedded-cluster/dev/build/.gocache # from dev volume mount
         - name: GOMODCACHE
-          value: /replicatedhq/embedded-cluster/dev/.gomodcache # from dev volume mount
+          value: /replicatedhq/embedded-cluster/dev/build/.gomodcache # from dev volume mount
         livenessProbe: ~
         readinessProbe: ~
         resources: ~

dev/scripts/up.sh

@@ -13,7 +13,7 @@ if [ -z "$component" ]; then
 fi
 
 # Ensure dev go cache / go mod cache directories exists
-mkdir -p dev/.gocache dev/.gomodcache
+mkdir -p dev/build/.gocache dev/build/.gomodcache
 
 # Build and load the image into the embedded cluster
 ec_build_and_load "$component"

local-artifact-mirror/deploy/melange.tmpl.yaml

@@ -17,7 +17,8 @@ environment:
       - git
       - go
   environment:
-    GOMODCACHE: /var/cache/melange
+    GOCACHE: /cache/melange/gocache
+    GOMODCACHE: /cache/melange/gomodcache
     K0S_MINOR_VERSION: ${K0S_MINOR_VERSION}
 
 pipeline:

operator/deploy/melange.tmpl.yaml

@@ -17,7 +17,8 @@ environment:
       - git
       - go
   environment:
-    GOMODCACHE: /var/cache/melange
+    GOCACHE: /cache/melange/gocache
+    GOMODCACHE: /cache/melange/gomodcache
     VERSION: ${PACKAGE_VERSION}
     K0S_MINOR_VERSION: ${K0S_MINOR_VERSION}
 

scripts/dryrun-tests.sh

@@ -20,8 +20,8 @@ plog "INFO" "Compiling test binary..." "🔨"
 docker run --rm \
     -v "$(pwd)":/ec \
     -w /ec \
-    -e GOCACHE=/ec/dev/.gocache \
-    -e GOMODCACHE=/ec/dev/.gomodcache \
+    -e GOCACHE=/ec/dev/build/.gocache \
+    -e GOMODCACHE=/ec/dev/build/.gomodcache \
     ec-dryrun \
     go test -c -o /ec/dev/build/dryrun.test ./tests/dryrun/...