From 983903872c919651e18d75220abcaa7015d1a9aa Mon Sep 17 00:00:00 2001 From: Unnati Mishra Date: Sat, 17 Jan 2026 12:51:27 +0530 Subject: [PATCH 1/2] Update golang + golangci-lint Signed-off-by: Unnati Mishra --- .github/workflows/golangci-lint.yml | 4 ++-- .golangci.yml | 17 ++++++++--------- Dockerfile | 2 +- go.mod | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 8123b7a0..caeffd91 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -26,7 +26,7 @@ jobs: with: go-version-file: go.mod - name: golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v7 with: - version: v1.64 + version: v2.4 args: -v diff --git a/.golangci.yml b/.golangci.yml index 87371e3f..362c6940 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,20 +1,19 @@ +version: "2" run: timeout: 5m linters: + default: none enable: - goheader - revive - unused - disable-all: true -# all available settings of specific linters -linters-settings: - goheader: - values: - regexp: - copyright-year: 20[0-9][0-9] - template-path: code-header-template.txt + settings: + goheader: + values: + regexp: + copyright-year: 20[0-9][0-9] + template-path: code-header-template.txt issues: max-issues-per-linter: 0 max-same-issues: 0 - exclude-use-default: false new-from-rev: ae7b7b79a75756ae3cec92e8bb8c6bf0c4dab48e diff --git a/Dockerfile b/Dockerfile index 8ef32512..618ae303 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.24.10 AS deps +FROM --platform=$BUILDPLATFORM golang:1.25.5 AS deps ARG TARGETOS TARGETARCH SGCTRL_VER=development WORKDIR /workspace diff --git a/go.mod b/go.mod index fef6ce38..c1cb942f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module carvel.dev/secretgen-controller -go 1.24.10 +go 1.25.5 require ( github.com/cloudfoundry/bosh-utils v0.0.563 // indirect From 5b2c2c5af3b67e4d181ec7bba2b8cf6371906352 Mon Sep 17 00:00:00 2001 From: Unnati Mishra Date: Tue, 17 Feb 2026 11:43:10 +0530 Subject: [PATCH 2/2] Bump carvel tools + golang 1.25.7 Signed-off-by: Unnati Mishra --- .github/workflows/kind-action.yml | 6 +++--- .github/workflows/release.yml | 12 ++++++------ .github/workflows/test-gh.yml | 6 +++--- Dockerfile | 2 +- go.mod | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/kind-action.yml b/.github/workflows/kind-action.yml index a3f7abf4..9e9aaa26 100644 --- a/.github/workflows/kind-action.yml +++ b/.github/workflows/kind-action.yml @@ -35,9 +35,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} only: ytt, kapp, kbld - ytt: v0.45.4 - kapp: v0.58.0 - kbld: v0.37.5 + ytt: v0.53.0 + kapp: v0.65.1 + kbld: v0.47.1 # Run benchmark with `go test -bench` and stores the output to a file - name: Install sg and run e2e tests on kind run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 676b4d3d..c7bd67c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,12 +28,12 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} only: ytt, kapp, kbld, imgpkg, kctrl, vendir - ytt: v0.52.1 - kapp: v0.64.2 - kbld: v0.47.0 - imgpkg: v0.47.0 - kctrl: v0.59.0 - vendir: v0.45.0 + ytt: v0.53.0 + kapp: v0.65.1 + kbld: v0.47.1 + imgpkg: v0.47.1 + kctrl: v0.59.2 + vendir: v0.45.1 - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index 52123c4f..248a88c5 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -57,9 +57,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} only: ytt, kapp, kbld - ytt: v0.45.4 - kapp: v0.58.0 - kbld: v0.37.5 + ytt: v0.53.0 + kapp: v0.65.1 + kbld: v0.47.1 - name: Run Tests run: | set -e -x diff --git a/Dockerfile b/Dockerfile index 618ae303..19087294 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.25.5 AS deps +FROM --platform=$BUILDPLATFORM golang:1.25.7 AS deps ARG TARGETOS TARGETARCH SGCTRL_VER=development WORKDIR /workspace diff --git a/go.mod b/go.mod index c1cb942f..308bfae7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module carvel.dev/secretgen-controller -go 1.25.5 +go 1.25.7 require ( github.com/cloudfoundry/bosh-utils v0.0.563 // indirect