From 75921b5e90245297797ef898ec7a456dbe2b6180 Mon Sep 17 00:00:00 2001
From: "cluster-stack-bot[bot]"
 <143188378+cluster-stack-bot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 11:22:47 +0000
Subject: [PATCH 1/2] :seedling: Update Github Actions group to v6.0.0

| datasource  | package          | from   | to     |
| ----------- | ---------------- | ------ | ------ |
| github-tags | actions/setup-go | v5.5.0 | v6.0.0 |
---
 .builder-image-version.txt                | 2 +-
 .github/actions/setup-go/action.yaml      | 2 +-
 .github/workflows/pr-lint.yml             | 2 +-
 .github/workflows/schedule-scan-image.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.builder-image-version.txt b/.builder-image-version.txt
index c5676407..73a29c94 100644
--- a/.builder-image-version.txt
+++ b/.builder-image-version.txt
@@ -1 +1 @@
-1.1.33
+1.1.34
diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml
index 8ce055b4..86581779 100644
--- a/.github/actions/setup-go/action.yaml
+++ b/.github/actions/setup-go/action.yaml
@@ -4,7 +4,7 @@ runs:
   using: "composite"
   steps:
     - name: Install go
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version: "1.24"
         go-version-file: "go.mod"
diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
index 78a016a0..fde5ad98 100644
--- a/.github/workflows/pr-lint.yml
+++ b/.github/workflows/pr-lint.yml
@@ -21,7 +21,7 @@ jobs:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.33
+      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.34
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}
diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml
index 2c86f3af..6d91f6c2 100644
--- a/.github/workflows/schedule-scan-image.yml
+++ b/.github/workflows/schedule-scan-image.yml
@@ -9,7 +9,7 @@ jobs:
     name: Trivy
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.33
+      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.34
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

From 8118a0189f007f6eb1eeb113de186bbb0beaabc4 Mon Sep 17 00:00:00 2001
From: Jan Schoone <jan.schoone@uhurutec.com>
Date: Fri, 19 Sep 2025 10:22:52 +0200
Subject: [PATCH 2/2] fix linter

Signed-off-by: Jan Schoone <jan.schoone@uhurutec.com>
---
 internal/controller/clusterstack_controller_test.go | 6 +++---
 pkg/test/utils/conditions.go                        | 2 ++
 pkg/test/utils/mod.go                               | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/controller/clusterstack_controller_test.go b/internal/controller/clusterstack_controller_test.go
index a6fcca3e..69c0c813 100644
--- a/internal/controller/clusterstack_controller_test.go
+++ b/internal/controller/clusterstack_controller_test.go
@@ -117,11 +117,11 @@ func TestMakeDiff(t *testing.T) {
 	expectedToDelete := []*csov1alpha1.ClusterStackRelease{csr1}
 
 	if !reflect.DeepEqual(toString(toCreate), toString(expectedToCreate)) {
-		t.Errorf("toCreate is not as expected")
+		t.Error("toCreate is not as expected")
 	}
 
 	if !reflect.DeepEqual(toString(toDelete), toString(expectedToDelete)) {
-		t.Errorf("toDelete is not as expected")
+		t.Error("toDelete is not as expected")
 	}
 
 	// Test Case 2:
@@ -239,7 +239,7 @@ func TestGetLatestReadyClusterStackRelease(t *testing.T) {
 		}
 		expectedLatest := "docker-ferrol-1-21-v3"
 		if latest == nil {
-			t.Errorf("Expected latest to be non-nil, but got nil")
+			t.Error("Expected latest to be non-nil, but got nil")
 		} else if *latest != expectedLatest {
 			t.Errorf("Expected latest to be %s, but got %s", expectedLatest, *latest)
 		}
diff --git a/pkg/test/utils/conditions.go b/pkg/test/utils/conditions.go
index 0c68a533..d0be438f 100644
--- a/pkg/test/utils/conditions.go
+++ b/pkg/test/utils/conditions.go
@@ -14,8 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+//revive:disable:var-naming
 package utils
 
+//revive:enable:var-naming
 import (
 	"context"
 
diff --git a/pkg/test/utils/mod.go b/pkg/test/utils/mod.go
index 5c399e59..cad13b88 100644
--- a/pkg/test/utils/mod.go
+++ b/pkg/test/utils/mod.go
@@ -15,8 +15,12 @@ limitations under the License.
 */
 
 // Package utils contains important functions for envtest.
+//
+//revive:disable:var-naming
 package utils
 
+//revive:enable:var-naming
+
 import (
 	"fmt"
 	"os"