Skip to content

Commit 0740899

Browse files
authored
Merge pull request #1098 from carvel-dev/bump-go-libraries-cve-fix
Bump Golang to 1.24.9 and other modules for CVE fixes
2 parents be214f1 + 0c12965 commit 0740899

1,554 files changed

Lines changed: 148858 additions & 48054 deletions

File tree

Some content is hidden

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

.github/workflows/golangci-lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
name: lint
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Set up Go
16-
uses: actions/setup-go@v5
17-
with:
18-
go-version: '1.23'
1915
- uses: actions/checkout@v4
2016
with:
2117
fetch-depth: '0'
18+
- name: Set up Go
19+
uses: actions/setup-go@v5
20+
with:
21+
go-version-file: go.mod
2222
- name: golangci-lint
2323
uses: golangci/golangci-lint-action@v6
2424
with:
25-
version: v1.58
25+
version: v1.64
2626
args: -v

.github/workflows/test-gh.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
max-parallel: 2
1616
matrix:
17-
k8s-version: [v1.27.0, latest]
17+
k8s-version: [v1.28.0, latest]
1818
steps:
1919
- name: install kind
2020
uses: helm/kind-action@v1
@@ -32,7 +32,14 @@ jobs:
3232
- name: Create Kind Cluster(k8s version ${{ env.k8s_version }})
3333
run: |
3434
k8s_version=${{ env.k8s_version }}
35-
kind create cluster --image kindest/node:${k8s_version}
35+
echo "Checking if kindest/node:${k8s_version} exists..."
36+
if docker pull kindest/node:${k8s_version}; then
37+
echo "Using kindest/node:${k8s_version}"
38+
kind create cluster --image kindest/node:${k8s_version}
39+
else
40+
echo "kindest/node:${k8s_version} not found. Using fallback image ghcr.io/carvel-dev/kindest/node:${k8s_version}"
41+
kind create cluster --image ghcr.io/carvel-dev/kindest/node:${k8s_version}
42+
fi
3643
- name: Verify kind and k8s version
3744
run: |
3845
kind version

go.mod

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
module carvel.dev/kapp
22

3-
go 1.23.3
3+
go 1.24.9
44

55
require (
66
github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef
77
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
88
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
99
github.com/cppforlife/go-patch v0.0.0-20240118020416-2147782e467b
10-
github.com/google/go-cmp v0.6.0
10+
github.com/google/go-cmp v0.7.0
1111
github.com/hashicorp/go-version v1.6.0
1212
github.com/k14s/difflib v0.0.0-20240118055029-596a7a5585c3
1313
github.com/k14s/ytt v0.36.0
1414
github.com/mitchellh/go-wordwrap v1.0.1
1515
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11
1616
github.com/spf13/cobra v1.8.1
17-
github.com/spf13/pflag v1.0.5
18-
github.com/stretchr/testify v1.9.0
17+
github.com/spf13/pflag v1.0.6
18+
github.com/stretchr/testify v1.10.0
1919
github.com/vmware-tanzu/carvel-kapp-controller v0.51.0
20-
golang.org/x/net v0.34.0
20+
golang.org/x/net v0.38.0
2121
gopkg.in/yaml.v2 v2.4.0
22-
k8s.io/api v0.31.2
22+
k8s.io/api v0.34.2
2323
k8s.io/apiextensions-apiserver v0.31.2
24-
k8s.io/apimachinery v0.31.2
24+
k8s.io/apimachinery v0.34.2
2525
k8s.io/apiserver v0.31.2
26-
k8s.io/client-go v0.31.2
26+
k8s.io/client-go v0.34.2
2727
k8s.io/component-helpers v0.31.2
28-
k8s.io/kubernetes v1.31.2
29-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
30-
sigs.k8s.io/yaml v1.4.0
28+
k8s.io/kubernetes v1.31.14
29+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
30+
sigs.k8s.io/yaml v1.6.0
3131
)
3232

3333
require (
@@ -36,18 +36,15 @@ require (
3636
github.com/blang/semver/v4 v4.0.0 // indirect
3737
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3838
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
39-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
40-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
39+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
40+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4141
github.com/go-logr/logr v1.4.2 // indirect
42-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
42+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4343
github.com/go-openapi/jsonreference v0.20.2 // indirect
44-
github.com/go-openapi/swag v0.22.4 // indirect
44+
github.com/go-openapi/swag v0.23.0 // indirect
4545
github.com/gogo/protobuf v1.3.2 // indirect
46-
github.com/golang/protobuf v1.5.4 // indirect
47-
github.com/google/gnostic-models v0.6.8 // indirect
48-
github.com/google/gofuzz v1.2.0 // indirect
46+
github.com/google/gnostic-models v0.7.0 // indirect
4947
github.com/google/uuid v1.6.0 // indirect
50-
github.com/imdario/mergo v0.3.12 // indirect
5148
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5249
github.com/josharian/intern v1.0.0 // indirect
5350
github.com/json-iterator/go v1.1.12 // indirect
@@ -56,27 +53,32 @@ require (
5653
github.com/mattn/go-colorable v0.1.13 // indirect
5754
github.com/mattn/go-isatty v0.0.20 // indirect
5855
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
59-
github.com/modern-go/reflect2 v1.0.2 // indirect
56+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6057
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6158
github.com/nxadm/tail v1.4.8 // indirect
59+
github.com/pkg/errors v0.9.1 // indirect
6260
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6361
github.com/prometheus/client_golang v1.19.1 // indirect
6462
github.com/prometheus/client_model v0.6.1 // indirect
6563
github.com/prometheus/common v0.55.0 // indirect
6664
github.com/prometheus/procfs v0.15.1 // indirect
6765
github.com/vito/go-interact v1.0.1 // indirect
6866
github.com/x448/float16 v0.8.4 // indirect
69-
golang.org/x/oauth2 v0.21.0 // indirect
70-
golang.org/x/sys v0.29.0 // indirect
71-
golang.org/x/term v0.28.0 // indirect
72-
golang.org/x/text v0.21.0 // indirect
73-
golang.org/x/time v0.3.0 // indirect
74-
google.golang.org/protobuf v1.34.2 // indirect
67+
go.yaml.in/yaml/v2 v2.4.2 // indirect
68+
go.yaml.in/yaml/v3 v3.0.4 // indirect
69+
golang.org/x/oauth2 v0.27.0 // indirect
70+
golang.org/x/sys v0.31.0 // indirect
71+
golang.org/x/term v0.30.0 // indirect
72+
golang.org/x/text v0.23.0 // indirect
73+
golang.org/x/time v0.9.0 // indirect
74+
google.golang.org/protobuf v1.36.5 // indirect
75+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7576
gopkg.in/inf.v0 v0.9.1 // indirect
7677
gopkg.in/yaml.v3 v3.0.1 // indirect
7778
k8s.io/component-base v0.31.2 // indirect
7879
k8s.io/klog/v2 v2.130.1 // indirect
79-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
80-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
81-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
80+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
81+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
82+
sigs.k8s.io/randfill v1.0.0 // indirect
83+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
8284
)

0 commit comments

Comments
 (0)