Update kube versions under test

Signed-off-by: Ryan Swanson <ryan.swanson@loft.sh>

Author: zerbitx

.github/workflows/e2e-tests.yaml

@@ -24,8 +24,8 @@ jobs:
     strategy:
       matrix:
         kubernetes_version:
-          - v1.27.3
-          - v1.28.0
+          - v1.35.0
+          - v1.34.3
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout repo
@@ -36,11 +36,11 @@ jobs:
       with:
         version: ${{ matrix.kubernetes_version }}
 
-    # Creates KinD with using k8s versions from the matrix above
-    - name: Set up kind with K8s version v1.22.4
+    # Creates kind using the Kubernetes versions from the matrix above
+    - name: Set up kind cluster
       uses: engineerd/setup-kind@v0.5.0
       with:
-        version: "v0.20.0"
+        version: "v0.31.0"
         image: kindest/node:${{ matrix.kubernetes_version }}
 
     - name: Testing kind cluster set-up

e2e/tests/restarthelper/restarthelper.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"io"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -20,6 +21,16 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+// writeUniqueBuildMarker ensures the test image is unique per run so it does not reuse an already-cached node image ID
+func writeUniqueBuildMarker(tempDir string) {
+	err := os.WriteFile(
+		filepath.Join(tempDir, ".devspace-e2e-build-marker"),
+		[]byte(time.Now().Format(time.RFC3339Nano)),
+		0644,
+	)
+	framework.ExpectNoError(err)
+}
+
 var _ = DevSpaceDescribe("restarthelper", func() {
 	initialDir, err := os.Getwd()
 	if err != nil {
@@ -44,6 +55,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 		tempDir, err := framework.CopyToTempDir("tests/restarthelper/testdata/v5")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
+		writeUniqueBuildMarker(tempDir)
 
 		ns, err := kubeClient.CreateNamespace("restarthelper")
 		framework.ExpectNoError(err)
@@ -125,6 +137,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 		tempDir, err := framework.CopyToTempDir("tests/restarthelper/testdata/v6")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
+		writeUniqueBuildMarker(tempDir)
 
 		ns, err := kubeClient.CreateNamespace("restarthelper")
 		framework.ExpectNoError(err)
@@ -206,6 +219,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 		tempDir, err := framework.CopyToTempDir("tests/restarthelper/testdata/v6-inject-restart-helper")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
+		writeUniqueBuildMarker(tempDir)
 
 		ns, err := kubeClient.CreateNamespace("restarthelper")
 		framework.ExpectNoError(err)
@@ -296,6 +310,7 @@ var _ = DevSpaceDescribe("restarthelper", func() {
 		tempDir, err := framework.CopyToTempDir("tests/restarthelper/testdata/v6-manual-start")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
+		writeUniqueBuildMarker(tempDir)
 
 		ns, err := kubeClient.CreateNamespace("restarthelper")
 		framework.ExpectNoError(err)

e2e/tests/restarthelper/testdata/v5/Dockerfile

@@ -1,2 +1,3 @@
 FROM alpine
-CMD ["sh", "-c" , "echo 'Started with legacy restart helper' && tail -f /dev/null"]
+COPY .devspace-e2e-build-marker /.devspace-e2e-build-marker
+CMD ["sh", "-c" , "echo 'Started with legacy restart helper' && tail -f /dev/null"]

e2e/tests/restarthelper/testdata/v6-inject-restart-helper/Dockerfile

@@ -1,2 +1,3 @@
 FROM alpine
-CMD ["sh", "-c" , "echo 'Started with legacy restart helper' && tail -f /dev/null"]
+COPY .devspace-e2e-build-marker /.devspace-e2e-build-marker
+CMD ["sh", "-c" , "echo 'Started with legacy restart helper' && tail -f /dev/null"]

e2e/tests/restarthelper/testdata/v6-manual-start/Dockerfile

@@ -1,2 +1,3 @@
 FROM alpine
-CMD ["sh", "-c" , "echo 'Started manually' && tail -f /dev/null"]
+COPY .devspace-e2e-build-marker /.devspace-e2e-build-marker
+CMD ["sh", "-c" , "echo 'Started manually' && tail -f /dev/null"]

e2e/tests/restarthelper/testdata/v6/Dockerfile

@@ -1,2 +1,3 @@
 FROM alpine
-CMD ["tail", "-f", "/dev/null"]
+COPY .devspace-e2e-build-marker /.devspace-e2e-build-marker
+CMD ["tail", "-f", "/dev/null"]

e2e/tests/sync/sync.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
@@ -834,11 +835,23 @@ var _ = DevSpaceDescribe("sync", func() {
 		// check that included file was not synced
 		framework.ExpectRemoteFileNotFound("alpine", ns, "/app/syncme/file.txt")
 
-		// write a file and check that it got synced
+		// Keep writing until the sync watcher observes a local change. This avoids
+		// racing the first write against watcher startup in slower CI environments.
 		payload := randutil.GenerateRandomString(10000)
-		err = os.WriteFile(filepath.Join(tempDir, "watching.txt"), []byte(payload), 0666)
+		err = wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute*2, true, func(_ context.Context) (done bool, err error) {
+			err = os.WriteFile(filepath.Join(tempDir, "watching.txt"), []byte(payload), 0666)
+			if err != nil {
+				return false, err
+			}
+
+			out, err := kubeClient.ExecByImageSelector("alpine", ns, []string{"cat", "/app/watching.txt"})
+			if err != nil {
+				return false, nil
+			}
+
+			return strings.TrimSpace(out) == strings.TrimSpace(payload), nil
+		})
 		framework.ExpectNoError(err)
-		framework.ExpectRemoteFileContents("alpine", ns, "/app/watching.txt", payload)
 
 		// stop command
 		stop()