Skip to content

Commit 0db137f

Browse files
liamfallonliamfallon
authored
security: upgrade golang to 1.25.6 to fix CVE-2025-61729 (#1214)
* Bump go version Signed-off-by: liamfallon <liam.fallon@est.tech> * Update docker base images to go 1.25.6 Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix ci job go-version-file Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix ci job go-version-file Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix ci job go-version-file Signed-off-by: liamfallon <liam.fallon@est.tech> * Fix ci job go-version-file Signed-off-by: liamfallon <liam.fallon@est.tech> * Bump version of golangci-lint Signed-off-by: liamfallon <liam.fallon@est.tech> * Update versions of kpt and sdk Signed-off-by: liamfallon <liam.fallon@est.tech> --------- Signed-off-by: liamfallon <liam.fallon@est.tech>
1 parent efaa814 commit 0db137f

File tree

72 files changed

+211
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+211
-258
lines changed

‎.github/workflows/after-push-to-branch.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ jobs:
2828
packages: write
2929
contents: read
3030
steps:
31-
- uses: actions/checkout@v4
32-
- uses: actions/setup-go@v5
31+
- uses: actions/checkout@v5
32+
- uses: actions/setup-go@v6
3333
with:
34-
go-version: '1.24.10'
34+
go-version-file: documentation/go.mod
35+
cache: true
3536
- uses: docker/setup-qemu-action@v3
3637
- uses: docker/setup-buildx-action@v3
3738
- name: Log in to GHCR
@@ -47,10 +48,11 @@ jobs:
4748
packages: write
4849
contents: read
4950
steps:
50-
- uses: actions/checkout@v4
51-
- uses: actions/setup-go@v5
51+
- uses: actions/checkout@v5
52+
- uses: actions/setup-go@v6
5253
with:
53-
go-version: '1.24.10'
54+
go-version-file: documentation/go.mod
55+
cache: true
5456
- uses: docker/setup-qemu-action@v3
5557
- uses: docker/setup-buildx-action@v3
5658
- name: Log in to GHCR

‎.github/workflows/after-tag-with-version.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ jobs:
3232
uses: actions/checkout@v4
3333

3434
- name: Setup Go
35-
uses: actions/setup-go@v5
35+
uses: actions/setup-go@v6
3636
with:
37-
go-version: '1.24.10'
37+
go-version-file: documentation/go.mod
38+
cache: true
3839

3940
- name: Setup QEMU
4041
uses: docker/setup-qemu-action@v3

‎.github/workflows/ci.yaml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
platform: [ubuntu-latest]
3232
runs-on: ${{ matrix.platform }}
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v5
3535
- name: Lint shell scripts, ignoring third-party files
3636
run: |
3737
find . -name "*.sh" > shell_files.out
@@ -43,15 +43,16 @@ jobs:
4343
GOPATH: /home/runner/work/krm-functions-catalog/functions/go
4444
GO111MODULE: on
4545
steps:
46-
- name: Set up Go 1.24.10
47-
uses: actions/setup-go@v5
48-
with:
49-
go-version: '1.24.10'
50-
id: go
5146
- name: Check out code into GOPATH
5247
uses: actions/checkout@v1
5348
with:
54-
path: go/src/github.com/${{ github.repository }}
49+
path: go/src/github.com/kptdev/krm-functions-catalog
50+
- name: Set up Go
51+
uses: actions/setup-go@v6
52+
with:
53+
go-version-file: documentation/go.mod
54+
cache: true
55+
id: go
5556
- name: Run unit tests
5657
run: |
5758
make unit-test
@@ -63,11 +64,12 @@ jobs:
6364
GOPATH: /home/runner/work/krm-functions-catalog/functions/go
6465
GO111MODULE: on
6566
steps:
66-
- uses: actions/checkout@v4
67-
- name: Set up Go 1.24.10
68-
uses: actions/setup-go@v5
67+
- uses: actions/checkout@v5
68+
- name: Set up Go
69+
uses: actions/setup-go@v6
6970
with:
70-
go-version: '1.24.10'
71+
go-version-file: documentation/go.mod
72+
cache: true
7173
- name: Install kpt
7274
run: |
7375
go install github.com/kptdev/kpt@main

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: function-release
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
- name: Create Short Tag for Function Release
3232
# Create secondary short tag, e.g. functions/go/apply-setters/v1.1.1 -> apply-setters/v1.1.1
3333
run: |

‎archived/build/docker/go/defaults.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
BUILDER_IMAGE=golang:1.24.10-alpine3.22
2-
BASE_IMAGE=alpine:3.22
1+
BUILDER_IMAGE=golang:1.25.6-alpine3.23
2+
BASE_IMAGE=alpine:3.23

‎archived/functions/go/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func-fmt:
9898

9999
func-lint:
100100
(which $(GOPATH)/bin/golangci-lint || \
101-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/v1.64.8/install.sh | sh -s -- -b $(GOPATH)/bin v1.64.8)
101+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/v2.8.0/install.sh | sh -s -- -b $(GOPATH)/bin v2.8.0)
102102
cd $(CURRENT_FUNCTION) && time $(GOPATH)/bin/golangci-lint run --timeout=10m ./...
103103

104104
func-test:

‎archived/functions/go/enable-gcp-services/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kptdev/krm-functions-catalog/archived/functions/go/project-services
22

3-
go 1.24.10
3+
go 1.25.6
44

55
require (
66
github.com/stretchr/testify v1.10.0

‎archived/functions/go/export-terraform/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kptdev/krm-functions-catalog/archived/functions/go/export-terraform
22

3-
go 1.24.10
3+
go 1.25.6
44

55
require (
66
github.com/kptdev/krm-functions-catalog/archived/functions/go/export-terraform/thirdparty/kyaml/fnsdk v0.0.0

‎archived/functions/go/fix/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kptdev/krm-functions-catalog/archived/functions/go/fix
22

3-
go 1.24.10
3+
go 1.25.6
44

55
require (
66
github.com/stretchr/testify v1.10.0

‎archived/functions/go/format/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kptdev/krm-functions-catalog/archived/functions/go/format
22

3-
go 1.24.10
3+
go 1.25.6
44

55
require sigs.k8s.io/kustomize/kyaml v0.19.0
66

0 commit comments

Comments
 (0)