Skip to content

Commit ee1898f

Browse files
authored
fix cve (#800)
* fix cve * remove inactivated linters * fix golangci-lint * fix go * fix python * fix sample cve * fix ci
1 parent 613a7bd commit ee1898f

File tree

19 files changed

+125
-120
lines changed

19 files changed

+125
-120
lines changed

.github/workflows/bundle-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ jobs:
4949
username: ${{ secrets.DOCKER_USER }}
5050
password: ${{ secrets.DOCKER_PASSWORD }}
5151

52-
- name: Set up GO 1.22.12
52+
- name: Set up GO 1.23.7
5353
uses: actions/setup-go@v1
5454
with:
55-
go-version: 1.22.12
55+
go-version: 1.23.7
5656
id: go
5757

5858
- name: InstallKubebuilder
@@ -180,10 +180,10 @@ jobs:
180180
username: ${{ secrets.DOCKER_USER }}
181181
password: ${{ secrets.DOCKER_PASSWORD }}
182182

183-
- name: Set up GO 1.22.12
183+
- name: Set up GO 1.23.7
184184
uses: actions/setup-go@v1
185185
with:
186-
go-version: 1.22.12
186+
go-version: 1.23.7
187187
id: go
188188

189189
- name: InstallKubebuilder

.github/workflows/olm-verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
- name: checkout
3535
uses: actions/checkout@v2
3636

37-
- name: Set up GO 1.22.12
37+
- name: Set up GO 1.23.7
3838
uses: actions/setup-go@v1
3939
with:
40-
go-version: 1.22.12
40+
go-version: 1.23.7
4141
id: go
4242

4343
- name: InstallKubebuilder

.github/workflows/project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
go-version: [1.21.9, 1.22.12]
21+
go-version: [1.22.12, 1.23.7]
2222
steps:
2323
- name: Free Disk Space (Ubuntu)
2424
uses: jlumbroso/[email protected]
@@ -51,7 +51,7 @@ jobs:
5151
5252
- name: InstallTool
5353
run: |
54-
wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.57.2
54+
wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.64.7
5555
./bin/golangci-lint --version
5656
5757
- name: validate controller-gen

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
username: ${{ secrets.DOCKER_USER }}
3838
password: ${{ secrets.DOCKER_PASSWORD }}
3939

40-
- name: Set up GO 1.22.12
40+
- name: Set up GO 1.23.7
4141
uses: actions/setup-go@v1
4242
with:
43-
go-version: 1.22.12
43+
go-version: 1.23.7
4444
id: go
4545

4646
- name: InstallKubebuilder

.github/workflows/test-helm-charts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
- uses: actions/setup-python@v2
6464
with:
65-
python-version: 3.7
65+
python-version: 3.9
6666

6767
- name: Set up chart-testing
6868
uses: helm/[email protected]
@@ -83,11 +83,11 @@ jobs:
8383
run: hack/kind-cluster-build.sh --name chart-testing -c 1 -v 10 --k8sVersion v1.23.17
8484
if: steps.list-changed.outputs.changed == 'true'
8585

86-
- name: Set up GO 1.22.12
86+
- name: Set up GO 1.23.7
8787
if: steps.list-changed.outputs.changed == 'true'
8888
uses: actions/setup-go@v1
8989
with:
90-
go-version: 1.22.12
90+
go-version: 1.23.7
9191
id: go
9292

9393
- name: setup kubebuilder 3.6.0

.github/workflows/trivy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
repository: ${{github.event.pull_request.head.repo.full_name}}
3535
ref: ${{ github.event.pull_request.head.sha }}
3636

37-
- name: Set up GO 1.22.12
37+
- name: Set up GO 1.23.7
3838
uses: actions/setup-go@v1
3939
with:
40-
go-version: 1.22.12
40+
go-version: 1.23.7
4141
id: go
4242

4343
- name: InstallKubebuilder

.github/workflows/trivy_scheduled_master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545
repository: ${{github.event.pull_request.head.repo.full_name}}
4646
ref: ${{ github.event.pull_request.head.sha }}
4747

48-
- name: Set up GO 1.22.12
48+
- name: Set up GO 1.23.7
4949
uses: actions/setup-go@v1
5050
with:
51-
go-version: 1.22.12
51+
go-version: 1.23.7
5252
id: go
5353

5454
- name: InstallKubebuilder

.golangci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ linters:
77
disable-all: true
88
enable:
99
- bodyclose
10-
- deadcode
10+
# - deadcode
1111
- goimports
12-
- golint
12+
# - golint
1313
- gosimple
1414
- govet
1515
- ineffassign
16-
- interfacer
16+
# - interfacer
1717
- misspell
1818
- staticcheck
19-
- structcheck
19+
# - structcheck
2020
- stylecheck
2121
- typecheck
2222
- unconvert
2323
- unparam
24-
- varcheck
24+
# - varcheck
2525
- prealloc

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.22.12-bullseye as builder
2+
FROM golang:1.23.7-bullseye as builder
33

44
WORKDIR /workspace/api
55
COPY api/ .

api/go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/streamnative/function-mesh/api
22

3-
go 1.21
3+
go 1.23.7
44

55
require (
6-
k8s.io/api v0.29.4
7-
k8s.io/apimachinery v0.29.4
6+
k8s.io/api v0.30.9
7+
k8s.io/apimachinery v0.30.9
88
k8s.io/autoscaler/vertical-pod-autoscaler v0.11.0
9-
k8s.io/client-go v0.29.4
10-
sigs.k8s.io/controller-runtime v0.17.3
9+
k8s.io/client-go v0.30.9
10+
sigs.k8s.io/controller-runtime v0.18.6
1111
)
1212

1313
require (
1414
github.com/davecgh/go-spew v1.1.1 // indirect
1515
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
1616
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
17-
github.com/go-logr/logr v1.4.1 // indirect
17+
github.com/go-logr/logr v1.4.2 // indirect
1818
github.com/go-openapi/jsonpointer v0.19.6 // indirect
1919
github.com/go-openapi/jsonreference v0.20.2 // indirect
2020
github.com/go-openapi/swag v0.22.3 // indirect
@@ -30,12 +30,12 @@ require (
3030
github.com/modern-go/reflect2 v1.0.2 // indirect
3131
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3232
github.com/pkg/errors v0.9.1 // indirect
33-
golang.org/x/net v0.33.0 // indirect
33+
golang.org/x/net v0.37.0 // indirect
3434
golang.org/x/oauth2 v0.12.0 // indirect
35-
golang.org/x/sys v0.28.0 // indirect
36-
golang.org/x/term v0.27.0 // indirect
37-
golang.org/x/text v0.21.0 // indirect
38-
golang.org/x/time v0.4.0 // indirect
35+
golang.org/x/sys v0.31.0 // indirect
36+
golang.org/x/term v0.30.0 // indirect
37+
golang.org/x/text v0.23.0 // indirect
38+
golang.org/x/time v0.3.0 // indirect
3939
google.golang.org/appengine v1.6.7 // indirect
4040
google.golang.org/protobuf v1.33.0 // indirect
4141
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)