Skip to content
This repository was archived by the owner on Jun 2, 2025. It is now read-only.

Commit 8591210

Browse files
xiangjinglixiangjingli
authored
bump golang.org/x/crypto to v0.35.0 with golang 1.23 for its cve fix (#427)
Signed-off-by: Xiangjing Li <[email protected]>
1 parent 4dc6103 commit 8591210

File tree

18 files changed

+43
-45
lines changed

18 files changed

+43
-45
lines changed

‎.github/workflows/go-postsubmit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
# Common versions
11-
GO_VERSION: '1.22'
11+
GO_VERSION: '1.23'
1212
GO_REQUIRED_MIN_VERSION: ''
1313
GOPATH: '/home/runner/work/multicloud-operators-subscription/multicloud-operators-subscription/go'
1414
defaults:

‎.github/workflows/go-presubmit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
# Common versions
11-
GO_VERSION: '1.22'
11+
GO_VERSION: '1.23'
1212
GO_REQUIRED_MIN_VERSION: ''
1313
GOPATH: '/home/runner/work/multicloud-operators-subscription/multicloud-operators-subscription/go'
1414
defaults:

‎.github/workflows/go-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'v*.*.*'
77
env:
88
# Common versions
9-
GO_VERSION: '1.22'
9+
GO_VERSION: '1.23'
1010
GO_REQUIRED_MIN_VERSION: ''
1111
GOPATH: '/home/runner/work/multicloud-operators-subscription/multicloud-operators-subscription/go'
1212
GITHUB_REF: ${{ github.ref }}

‎build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/stolostron/builder:go1.22-linux AS plugin-builder
1+
FROM registry.ci.openshift.org/stolostron/builder:go1.23-linux AS plugin-builder
22
ENV POLICY_GENERATOR_TAG=v1.16.0
33

44
WORKDIR /go/src/github.com/open-cluster-management/multicloud-operators-subscription

‎build/Dockerfile.prow‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/stolostron/builder:go1.22-linux AS builder
1+
FROM registry.ci.openshift.org/stolostron/builder:go1.23-linux AS builder
22
ENV POLICY_GENERATOR_TAG=v1.16.0
33

44
WORKDIR /go/src/github.com/stolostron/multicluster-operators-subscription

‎build/Dockerfile.rhtap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 AS plugin-builder
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS plugin-builder
22
ENV POLICY_GENERATOR_TAG=v1.16.0
33

44
WORKDIR /go/src/github.com/open-cluster-management/multicloud-operators-subscription

‎build/e2e-kc.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,11 @@ if kubectl get deploy ingress | grep "2/2"; then
394394
echo "12-helm-update: found 2/2 in deploy ingress"
395395
else
396396
echo "12-helm-update: FAILED: 2/2 is not in in deploy ingress"
397+
kubectl get pods -n open-cluster-management-agent-addon -l component=application-manager
398+
kubectl logs -n open-cluster-management-agent-addon -l component=application-manager
399+
kubectl get appsub -n default ingress -o yaml
400+
kubectl get appsubstatus -n default ingress -o yaml
401+
397402
exit 1
398403
fi
399404
kubectl config use-context kind-hub

‎build/run-code-lint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ gem install mdl
3737
gem install awesome_bot
3838

3939
# Install golangci-lint
40-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.57.2
40+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.60.2
4141

4242
# Start lint task
4343
make -f Makefile.prow lint-all

‎common/config/.golangci.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
service:
22
# When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo.
3-
golangci-lint-version: 1.57.x # use the fixed version to not introduce new linters unexpectedly
3+
golangci-lint-version: 1.60.x # use the fixed version to not introduce new linters unexpectedly
44
run:
55
# timeout for analysis, e.g. 30s, 5m, default is 1m
66
deadline: 20m
@@ -12,16 +12,18 @@ linters:
1212
- bodyclose
1313
- containedctx
1414
- contextcheck
15+
- copyloopvar
1516
- cyclop
16-
- deadcode
1717
- depguard
1818
- dupl
1919
- forbidigo
2020
- funlen
2121
- errchkjson
2222
- exhaustive
2323
- exhaustruct
24-
- exhaustivestruct
24+
- exportloopref
25+
- execinquery
26+
- err113
2527
- forcetypeassert
2628
- gci
2729
- ginkgolinter
@@ -31,44 +33,35 @@ linters:
3133
- gocritic
3234
- gocyclo
3335
- godot
34-
- goerr113
3536
- gofumpt
36-
- golint
3737
- gomnd
3838
- gomoddirectives
3939
- gosec
40-
- ifshort
4140
- ineffassign
4241
- interfacebloat
43-
- interfacer
4442
- ireturn
4543
- loggercheck
46-
- maintidx
47-
- maligned
44+
- maintidx
45+
- mnd
4846
- musttag
4947
- nakedret
5048
- nestif
5149
- nilerr
5250
- nilnil
5351
- nlreturn
5452
- noctx
55-
- nosnakecase
5653
- nonamedreturns
57-
- nosnakecase
5854
- paralleltest
5955
- prealloc
6056
- predeclared
6157
- rowserrcheck
62-
- scopelint
6358
- staticcheck
64-
- structcheck
6559
- sqlclosecheck
6660
- tagliatelle
6761
- tenv
6862
- testpackage
6963
- thelper
7064
- usestdlibvars
71-
- varcheck
7265
- varnamelen
7366
- wastedassign
7467
- wrapcheck

‎common/scripts/lint_go.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
17+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.2
1818

1919
export GOLANGCI_LINT_CACHE=/tmp/golangci-cache
2020
export GOROOT=`go env GOROOT`

0 commit comments

Comments
 (0)