Skip to content

Commit 0dd498f

Browse files
committed
updated golang oauth2, crypto and net to address CVES. Fixed build error with unuesed code
1 parent 50fd89d commit 0dd498f

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

calico-3.29.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,22 @@ pipeline:
6868
repository: https://github.com/projectcalico/calico
6969
tag: v${{package.version}}
7070
expected-commit: c29210835f7a2795d0791974602c8e1c625c8ca1
71+
- runs: |
72+
# apiserver/cmd/apiserver
73+
sed -i '/_ "k8s.io\/code-generator\/cmd\/import-boss"/s/^/\/\//g' apiserver/cmd/apiserver/tools.go
74+
sed -i '/_ "k8s.io\/code-generator\/cmd\/openapi-gen"/s/^/\/\//g' apiserver/cmd/apiserver/tools.go
75+
sed -i '/_ "k8s.io\/code-generator\/cmd\/set-gen"/s/^/\/\//g' apiserver/cmd/apiserver/tools.go
76+
# libcaliico-go
77+
sed -i '/_ "k8s.io\/code-generator\/cmd\/import-boss"/s/^/\/\//g' libcalico-go/tools.go
78+
sed -i '/_ "k8s.io\/code-generator\/cmd\/set-gen"/s/^/\/\//g' libcalico-go/tools.go
79+
# updates all x.30.9 to x.30.11
80+
sed -i 's/\.30\.9/\.30\.11/g' go.mod
7181
- uses: go/bump
7282
with:
7383
deps: |-
84+
golang.org/x/crypto@v0.35.0
7485
golang.org/x/oauth2@v0.27.0
86+
golang.org/x/net@v0.36.0
7587
# Because we are using tigera-operator during image test we are reliant on tigera-operator setting
7688
# up all the required rbac rules that are needed for calico-apiserver to run. Currently it does not and
7789
# this is a temporary solution until https://github.com/tigera/operator/issues/3780 is resolved upstream with a new

0 commit comments

Comments
 (0)