From a6d462f6e83915b6c6816c3c483d217157690728 Mon Sep 17 00:00:00 2001
From: Michael <mmatur@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:12:05 +0100
Subject: [PATCH 1/2] feat: upgrade gh-action os

---
 .github/workflows/build.yaml            | 4 ++--
 .github/workflows/check_doc.yml         | 2 +-
 .github/workflows/documentation.yml     | 2 +-
 .github/workflows/experimental.yaml     | 2 +-
 .github/workflows/test-integration.yaml | 4 ++--
 .github/workflows/test-unit.yaml        | 2 +-
 .github/workflows/validate.yaml         | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d7cf99bcb..b0c36ebe8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
 
   build-webui:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out code
@@ -35,7 +35,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-latest, windows-latest ]
+        os: [ ubuntu-22.04, macos-latest, windows-latest ]
     needs:
       - build-webui
 
diff --git a/.github/workflows/check_doc.yml b/.github/workflows/check_doc.yml
index 9f08efbb1..9851e1a54 100644
--- a/.github/workflows/check_doc.yml
+++ b/.github/workflows/check_doc.yml
@@ -9,7 +9,7 @@ jobs:
 
   docs:
     name: Check, verify and build documentation
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out code
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 5a1f215d3..fd08fe4de 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -14,7 +14,7 @@ jobs:
 
   docs:
     name: Doc Process
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'traefik/traefik'
 
     steps:
diff --git a/.github/workflows/experimental.yaml b/.github/workflows/experimental.yaml
index a26178315..489401f50 100644
--- a/.github/workflows/experimental.yaml
+++ b/.github/workflows/experimental.yaml
@@ -15,7 +15,7 @@ jobs:
   experimental:
     if: github.repository == 'traefik/traefik'
     name: Build experimental image on branch
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
 
diff --git a/.github/workflows/test-integration.yaml b/.github/workflows/test-integration.yaml
index d5c4e5ca1..5155fa78f 100644
--- a/.github/workflows/test-integration.yaml
+++ b/.github/workflows/test-integration.yaml
@@ -15,7 +15,7 @@ env:
 jobs:
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out code
@@ -35,7 +35,7 @@ jobs:
         run: make binary
 
   test-integration:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - build
     strategy:
diff --git a/.github/workflows/test-unit.yaml b/.github/workflows/test-unit.yaml
index 7719186f7..0ab4ab0a5 100644
--- a/.github/workflows/test-unit.yaml
+++ b/.github/workflows/test-unit.yaml
@@ -11,7 +11,7 @@ env:
 jobs:
 
   test-unit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out code
diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
index f836e94ee..a05fed052 100644
--- a/.github/workflows/validate.yaml
+++ b/.github/workflows/validate.yaml
@@ -13,7 +13,7 @@ env:
 jobs:
 
   validate:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out code
@@ -39,7 +39,7 @@ jobs:
         run: make validate
 
   validate-generate:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out code

From 8da38ec0a56f164e37bb87daa8b2a68c1e02f64d Mon Sep 17 00:00:00 2001
From: Michael <mmatur@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:44:05 +0100
Subject: [PATCH 2/2] fix: tailscale is required for Docker Desktop users

---
 integration/integration_test.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/integration/integration_test.go b/integration/integration_test.go
index 0ded401de..4ce934535 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -37,6 +37,8 @@ import (
 
 var showLog = flag.Bool("tlog", false, "always show Traefik logs")
 
+const tailscaleSecretFilePath = "tailscale.secret"
+
 type composeConfig struct {
 	Services map[string]composeService `yaml:"services"`
 }
@@ -99,6 +101,11 @@ func (s *BaseSuite) displayTraefikLogFile(path string) {
 }
 
 func (s *BaseSuite) SetupSuite() {
+	if isDockerDesktop(context.Background(), s.T()) {
+		_, err := os.Stat(tailscaleSecretFilePath)
+		require.NoError(s.T(), err, "Tailscale need to be configured when running integration tests with Docker Desktop: (https://doc.traefik.io/traefik/v2.11/contributing/building-testing/#testing)")
+	}
+
 	// configure default standard log.
 	stdlog.SetFlags(stdlog.Lshortfile | stdlog.LstdFlags)
 	// TODO
@@ -124,7 +131,7 @@ func (s *BaseSuite) SetupSuite() {
 	s.hostIP = "172.31.42.1"
 	if isDockerDesktop(ctx, s.T()) {
 		s.hostIP = getDockerDesktopHostIP(ctx, s.T())
-		s.setupVPN("tailscale.secret")
+		s.setupVPN(tailscaleSecretFilePath)
 	}
 }