From 1ddba0cbccf20f7b4452ba894595ce1c896c55ed Mon Sep 17 00:00:00 2001
From: Mario Manno <mmanno@suse.com>
Date: Wed, 10 Jul 2024 18:44:46 +0200
Subject: [PATCH] Bump k3s/k3d versions

---
 .github/workflows/e2e-ci.yml                               | 4 ++--
 .github/workflows/e2e-fleet-upgrade-ci.yml                 | 4 ++--
 .github/workflows/e2e-multicluster-ci.yml                  | 2 +-
 .github/workflows/e2e-nightly-ci.yml                       | 4 ++--
 .github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml | 4 ++--
 .github/workflows/e2e-rancher-upgrade-fleet.yml            | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml
index f308446de8..99fa10da97 100644
--- a/.github/workflows/e2e-ci.yml
+++ b/.github/workflows/e2e-ci.yml
@@ -16,7 +16,7 @@ on:
 env:
   GOARCH: amd64
   CGO_ENABLED: 0
-  SETUP_K3D_VERSION: 'v5.5.1'
+  SETUP_K3D_VERSION: 'v5.7.1'
 
 jobs:
   e2e-fleet-test:
@@ -27,7 +27,7 @@ jobs:
         k3s_version:
           # k3d version list k3s | sed 's/+/-/' | sort -h
           # https://hub.docker.com/r/rancher/k3s/tags
-          - v1.29.0-k3s1
+          - v1.30.2-k3s2
           - v1.24.17-k3s1
         test_type:
           - name: default
diff --git a/.github/workflows/e2e-fleet-upgrade-ci.yml b/.github/workflows/e2e-fleet-upgrade-ci.yml
index 00ab16c341..cfaaf2b568 100644
--- a/.github/workflows/e2e-fleet-upgrade-ci.yml
+++ b/.github/workflows/e2e-fleet-upgrade-ci.yml
@@ -15,7 +15,7 @@ on:
 env:
   GOARCH: amd64
   CGO_ENABLED: 0
-  SETUP_K3D_VERSION: 'v5.5.1'
+  SETUP_K3D_VERSION: 'v5.7.1'
 
 jobs:
   fleet-upgrade-test:
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         k3s_version:
-          - v1.27.5-k3s1
+          - v1.30.2-k3s2
     steps:
       -
         uses: actions/checkout@v4
diff --git a/.github/workflows/e2e-multicluster-ci.yml b/.github/workflows/e2e-multicluster-ci.yml
index b56357f82a..93a5f2c6e6 100644
--- a/.github/workflows/e2e-multicluster-ci.yml
+++ b/.github/workflows/e2e-multicluster-ci.yml
@@ -18,7 +18,7 @@ on:
 env:
   GOARCH: amd64
   CGO_ENABLED: 0
-  SETUP_K3D_VERSION: 'v5.5.1'
+  SETUP_K3D_VERSION: 'v5.7.1'
 
 jobs:
   e2e-fleet-mc-test:
diff --git a/.github/workflows/e2e-nightly-ci.yml b/.github/workflows/e2e-nightly-ci.yml
index 6f721c075c..8963640b80 100644
--- a/.github/workflows/e2e-nightly-ci.yml
+++ b/.github/workflows/e2e-nightly-ci.yml
@@ -15,7 +15,7 @@ on:
 env:
   GOARCH: amd64
   CGO_ENABLED: 0
-  SETUP_K3D_VERSION: 'v5.5.1'
+  SETUP_K3D_VERSION: 'v5.7.1'
 
 jobs:
   e2e-fleet-test:
@@ -25,8 +25,8 @@ jobs:
         k3s_version:
           # k3d version list k3s | sed 's/+/-/' | sort -h
           # https://hub.docker.com/r/rancher/k3s/tags
+          - v1.30.2-k3s2
           - v1.27.5-k3s1
-          - v1.26.8-k3s1
           - v1.24.17-k3s1
         test_type:
           - acceptance
diff --git a/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml b/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml
index ba94328d89..47fcaa0b1c 100644
--- a/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml
+++ b/.github/workflows/e2e-rancher-upgrade-fleet-to-head-ci.yml
@@ -23,8 +23,8 @@ on:
 env:
   GOARCH: amd64
   CGO_ENABLED: 0
-  SETUP_K3D_VERSION: 'v5.5.1'
-  SETUP_K3S_VERSION: 'v1.26.8-k3s1'
+  SETUP_K3D_VERSION: 'v5.7.1'
+  SETUP_K3S_VERSION: 'v1.30.2-k3s2'
 
 jobs:
   rancher-fleet-integration:
diff --git a/.github/workflows/e2e-rancher-upgrade-fleet.yml b/.github/workflows/e2e-rancher-upgrade-fleet.yml
index 473d8af57a..3c6aed8cf5 100644
--- a/.github/workflows/e2e-rancher-upgrade-fleet.yml
+++ b/.github/workflows/e2e-rancher-upgrade-fleet.yml
@@ -38,7 +38,7 @@ on:
 env:
   GOARCH: amd64
   CGO_ENABLED: 0
-  SETUP_K3D_VERSION: 'v5.5.1'
+  SETUP_K3D_VERSION: 'v5.7.1'
 
 jobs:
   rancher-fleet-upgrade: