From 2bfc16f7883b38d18dec8f69f178596545c5e930 Mon Sep 17 00:00:00 2001
From: Ljubisa Gacevic <ljubisa.rs@gmail.com>
Date: Sun, 10 Aug 2025 17:49:36 +0200
Subject: [PATCH 1/5] chore: change beekeper branch to feat/nuker

---
 .github/workflows/beekeeper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index ff36eff2514..dbfea84c9a5 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -14,7 +14,7 @@ env:
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"
   SETUP_CONTRACT_IMAGE_TAG: "0.9.4"
   BEELOCAL_BRANCH: "main"
-  BEEKEEPER_BRANCH: "master"
+  BEEKEEPER_BRANCH: "feat/nuker"
   BEEKEEPER_METRICS_ENABLED: false
   REACHABILITY_OVERRIDE_PUBLIC: true
   BATCHFACTOR_OVERRIDE_PUBLIC: 2

From c077927e27487a5bd2c4617e01c3ebe6cf20cda3 Mon Sep 17 00:00:00 2001
From: Ljubisa Gacevic <ljubisa.rs@gmail.com>
Date: Wed, 13 Aug 2025 14:41:40 +0200
Subject: [PATCH 2/5] chore: bump k3s

---
 .github/workflows/beekeeper.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index dbfea84c9a5..39844fc3ada 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -8,12 +8,12 @@ on:
       - "**"
 
 env:
-  K3S_VERSION: "v1.30.3+k3s1"
+  K3S_VERSION: "v1.31.1+k3s1"
   REPLICA: 3
   RUN_TYPE: "PR RUN"
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"
   SETUP_CONTRACT_IMAGE_TAG: "0.9.4"
-  BEELOCAL_BRANCH: "main"
+  BEELOCAL_BRANCH: "bump-k3d-k3s"
   BEEKEEPER_BRANCH: "feat/nuker"
   BEEKEEPER_METRICS_ENABLED: false
   REACHABILITY_OVERRIDE_PUBLIC: true

From 0d36cc5b2635fd18d8ee798dd6e96f1058211feb Mon Sep 17 00:00:00 2001
From: Ljubisa Gacevic <ljubisa.rs@gmail.com>
Date: Wed, 13 Aug 2025 14:44:29 +0200
Subject: [PATCH 3/5] chore: bump k3s

---
 .github/workflows/beekeeper.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index 39844fc3ada..9461f0dcae5 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -8,7 +8,7 @@ on:
       - "**"
 
 env:
-  K3S_VERSION: "v1.31.1+k3s1"
+  K3S_VERSION: "v1.31.10+k3s1"
   REPLICA: 3
   RUN_TYPE: "PR RUN"
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"

From 8a756b72224508d57b0857e9eb2f2be3e32fbf81 Mon Sep 17 00:00:00 2001
From: Ljubisa Gacevic <ljubisa.rs@gmail.com>
Date: Wed, 13 Aug 2025 15:33:28 +0200
Subject: [PATCH 4/5] chore: set beekeeper branch to bump-k8s-deps

---
 .github/workflows/beekeeper.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index 9461f0dcae5..8645025ab0f 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -14,7 +14,7 @@ env:
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"
   SETUP_CONTRACT_IMAGE_TAG: "0.9.4"
   BEELOCAL_BRANCH: "bump-k3d-k3s"
-  BEEKEEPER_BRANCH: "feat/nuker"
+  BEEKEEPER_BRANCH: "bump-k8s-deps"
   BEEKEEPER_METRICS_ENABLED: false
   REACHABILITY_OVERRIDE_PUBLIC: true
   BATCHFACTOR_OVERRIDE_PUBLIC: 2
@@ -190,7 +190,6 @@ jobs:
           if ${{ steps.pushsync-chunks-2.outcome=='failure' }}; then FAILED=pushsync-chunks-2; fi
           if ${{ steps.retrieval.outcome=='failure' }}; then FAILED=retrieval; fi
           if ${{ steps.manifest.outcome=='failure' }}; then FAILED=manifest; fi
-          if ${{ steps.content-availability.outcome=='failure' }}; then FAILED=content-availability; fi
           if ${{ steps.act.outcome=='failure' }}; then FAILED=act; fi
           curl -sSf -X POST -H "Content-Type: application/json" -d "{\"text\": \"**${RUN_TYPE}** Beekeeper Error\nBranch: \`${{ github.head_ref }}\`\nUser: @${{ github.event.pull_request.user.login }}\nDebugging artifacts: [click](https://$BUCKET_NAME.$AWS_ENDPOINT/artifacts_$VERTAG.tar.gz)\nStep failed: \`${FAILED}\`\"}" https://beehive.ethswarm.org/hooks/${{ secrets.TUNSHELL_KEY }}
           echo "Failed test: ${FAILED}"

From f670fb02a5363380be62d3abe99466a709da41d7 Mon Sep 17 00:00:00 2001
From: Ljubisa Gacevic <ljubisa.rs@gmail.com>
Date: Fri, 15 Aug 2025 13:07:05 +0200
Subject: [PATCH 5/5] chore(ci): set beelocal and beekeeper branch to default

---
 .github/workflows/beekeeper.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/beekeeper.yml b/.github/workflows/beekeeper.yml
index 8645025ab0f..5006a520d2c 100644
--- a/.github/workflows/beekeeper.yml
+++ b/.github/workflows/beekeeper.yml
@@ -13,8 +13,8 @@ env:
   RUN_TYPE: "PR RUN"
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"
   SETUP_CONTRACT_IMAGE_TAG: "0.9.4"
-  BEELOCAL_BRANCH: "bump-k3d-k3s"
-  BEEKEEPER_BRANCH: "bump-k8s-deps"
+  BEELOCAL_BRANCH: "main"
+  BEEKEEPER_BRANCH: "master"
   BEEKEEPER_METRICS_ENABLED: false
   REACHABILITY_OVERRIDE_PUBLIC: true
   BATCHFACTOR_OVERRIDE_PUBLIC: 2