Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .builder-image-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.33
1.1.34
2 changes: 1 addition & 1 deletion .github/actions/setup-go/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule-scan-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/clusterstack_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/test/utils/conditions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 4 additions & 0 deletions pkg/test/utils/mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading