Skip to content

Commit b221a85

Browse files
Merge pull request #1732 from devanshuVmware/bump-go
Update go version to fix CVEs
2 parents 46c341a + 69ed5ac commit b221a85

File tree

114 files changed

+5646
-1547
lines changed

Some content is hidden

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

114 files changed

+5646
-1547
lines changed

.github/workflows/benchmark-action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
name: Performance regression check
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4.1.2
24+
- uses: actions/checkout@v4
2525
- uses: actions/setup-go@v5 # default version of go is 1.10
2626
with:
27-
go-version: 1.23.3
27+
go-version-file: go.mod
2828
- name: Install Carvel Tools
2929
run: ./hack/install-deps.sh
3030
# Run benchmark with `go test -bench` and stores the output to a file

.github/workflows/dependency-updater.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4.1.2
13+
uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
1616
- name: Set up Go 1.x
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.23.3
19+
go-version-file: go.mod
2020
- name: Update Dependencies File
2121
run: go run ./hack/dependencies.go update
2222
- name: Create Pull Request

.github/workflows/golangci-lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
name: lint
1919
runs-on: ubuntu-latest
2020
steps:
21+
- uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 0
2124
- name: Set up Go 1.x
2225
uses: actions/setup-go@v5
2326
with:
24-
go-version: 1.23.3
25-
- uses: actions/[email protected]
26-
with:
27-
fetch-depth: '0'
27+
go-version-file: go.mod
2828
- name: golangci-lint
2929
uses: golangci/[email protected]
3030
with:

.github/workflows/kind-action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: helm/kind-action@v1
2222
with:
2323
cluster_name: kinder
24-
- uses: actions/checkout@v4.1.2
24+
- uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727
- uses: actions/setup-go@v5

.github/workflows/release-process.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
id-token: write
1717
steps:
1818
- name: Check out code
19-
uses: actions/checkout@v4.1.2
19+
uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
2222

@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up Go 1.x
4040
uses: actions/setup-go@v5
4141
with:
42-
go-version: 1.23.3
42+
go-version-file: go.mod
4343

4444
- name: Set up Cosign
4545
uses: sigstore/[email protected]

.github/workflows/test-kctrl-gh.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
name: Test kctrl GH
2222
runs-on: ubuntu-latest
2323
steps:
24-
- name: Set up Go 1.x
25-
uses: actions/setup-go@v5
26-
with:
27-
go-version: 1.23.3
2824
- name: Check out code
29-
uses: actions/checkout@v4.1.2
25+
uses: actions/checkout@v4
3026
with:
3127
fetch-depth: 0
28+
- name: Set up Go 1.x
29+
uses: actions/setup-go@v5
30+
with:
31+
go-version-file: go.mod
3232
- name: Install Carvel Tools
3333
uses: carvel-dev/setup-action@v2
3434
with:

.github/workflows/trivy-scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ jobs:
6464
security-events: write
6565
steps:
6666
- name: Checkout
67-
uses: actions/checkout@v4.1.2
67+
uses: actions/checkout@v4
6868
with:
6969
fetch-depth: 0
7070
- name: Set up Go 1.x
7171
uses: actions/setup-go@v5
7272
with:
73-
go-version: 1.23.3
73+
go-version-file: go.mod
7474
- name: Build the kapp-controller artifacts
7575
run: |
7676
./hack/install-deps.sh

.github/workflows/upgrade-testing.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ jobs:
2323
name: Upgrade Testing
2424
runs-on: ubuntu-latest
2525
steps:
26+
- name: Check out code
27+
uses: actions/checkout@v4
28+
with:
29+
fetch-depth: 0
2630
- name: Set up Go 1.x
2731
uses: actions/setup-go@v5
2832
with:
29-
go-version: 1.23.3
30-
- name: Check out code
31-
uses: actions/[email protected]
33+
go-version-file: go.mod
3234
- name: Install Carvel Tools
3335
run: ./hack/install-deps.sh
3436
- name: Run Upgrade Test

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS deps
1+
FROM --platform=$BUILDPLATFORM golang:1.23.8 AS deps
22

33
ARG TARGETOS TARGETARCH KCTRL_VER=development
44
WORKDIR /workspace

cli/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
module carvel.dev/kapp-controller/cli
22

3-
go 1.23.6
3+
go 1.23.8
44

55
require (
6-
carvel.dev/kapp-controller v0.56.2-0.20250506145110-5a51bb23420d
7-
carvel.dev/vendir v0.43.0
6+
carvel.dev/kapp-controller v0.57.0
7+
carvel.dev/vendir v0.44.0
88
github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef
99
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
1010
github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663
1111
github.com/getkin/kin-openapi v0.131.0
1212
github.com/google/gnostic-models v0.6.8
13-
github.com/google/go-containerregistry v0.20.2
13+
github.com/google/go-containerregistry v0.20.3
1414
github.com/k14s/difflib v0.0.0-20201117154628-0c031775bf57
1515
github.com/mitchellh/go-wordwrap v1.0.1
1616
github.com/otiai10/copy v1.2.0
17-
github.com/spf13/cobra v1.8.1
18-
github.com/spf13/pflag v1.0.5
17+
github.com/spf13/cobra v1.9.1
18+
github.com/spf13/pflag v1.0.6
1919
github.com/stretchr/testify v1.10.0
2020
gopkg.in/yaml.v2 v2.4.0
2121
gopkg.in/yaml.v3 v3.0.1
@@ -54,7 +54,7 @@ require (
5454
github.com/json-iterator/go v1.1.12 // indirect
5555
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115 // indirect
5656
github.com/mailru/easyjson v0.7.7 // indirect
57-
github.com/mattn/go-colorable v0.1.13 // indirect
57+
github.com/mattn/go-colorable v0.1.14 // indirect
5858
github.com/mattn/go-isatty v0.0.20 // indirect
5959
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6060
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -77,8 +77,8 @@ require (
7777
golang.org/x/crypto v0.36.0 // indirect
7878
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
7979
golang.org/x/net v0.38.0 // indirect
80-
golang.org/x/oauth2 v0.24.0 // indirect
81-
golang.org/x/sys v0.31.0 // indirect
80+
golang.org/x/oauth2 v0.25.0 // indirect
81+
golang.org/x/sys v0.32.0 // indirect
8282
golang.org/x/term v0.30.0 // indirect
8383
golang.org/x/text v0.23.0 // indirect
8484
golang.org/x/time v0.3.0 // indirect

0 commit comments

Comments
 (0)