Skip to content

Commit bca63f4

Browse files
dhaiducekopenshift-merge-robot
authored andcommitted
Update to Go 1.20
Signed-off-by: Dale Haiducek <[email protected]>
1 parent cc5dcea commit bca63f4

File tree

9 files changed

+119
-598
lines changed

9 files changed

+119
-598
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ fmt:
8888

8989
.PHONY: lint-dependencies
9090
lint-dependencies:
91-
$(call go-get-tool,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2)
91+
$(call go-get-tool,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2)
9292

9393
.PHONY: lint
9494
lint: lint-dependencies lint-all
@@ -108,7 +108,7 @@ test-coverage: test
108108

109109
.PHONY: gosec
110110
gosec:
111-
$(call go-get-tool,github.com/securego/gosec/v2/cmd/gosec@v2.9.6)
111+
$(call go-get-tool,github.com/securego/gosec/v2/cmd/gosec@v2.15.0)
112112

113113
.PHONY: gosec-scan
114114
gosec-scan: gosec

build/common/config/.golangci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
service:
2-
# When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo.
3-
golangci-lint-version: 1.18.x # use the fixed version to not introduce new linters unexpectedly
41
run:
52
# timeout for analysis, e.g. 30s, 5m, default is 1m
63
deadline: 20m
7-
go: '1.17'
84
timeout: 20m
95

106
# which dirs to skip: they won't be analyzed;

cmd/PolicyGenerator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func main() {
2727
}
2828

2929
// Output results to stdout for Kustomize to handle
30-
// nolint:forbidigo
30+
//nolint:forbidigo
3131
fmt.Print(outputBuffer.String())
3232
}
3333

go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
module open-cluster-management.io/policy-generator-plugin
22

3-
go 1.18
3+
go 1.20
44

55
require (
6-
github.com/google/go-cmp v0.5.7
6+
github.com/google/go-cmp v0.5.9
77
github.com/pmezard/go-difflib v1.0.0
88
github.com/spf13/pflag v1.0.5
9-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
10-
k8s.io/apimachinery v0.23.3
11-
sigs.k8s.io/kustomize/api v0.11.2
12-
sigs.k8s.io/kustomize/kyaml v0.13.3
9+
gopkg.in/yaml.v3 v3.0.1
10+
k8s.io/apimachinery v0.26.3
11+
sigs.k8s.io/kustomize/api v0.13.2
12+
sigs.k8s.io/kustomize/kyaml v0.14.1
1313
)
1414

1515
require (
16-
github.com/PuerkitoBio/purell v1.1.1 // indirect
17-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
1816
github.com/davecgh/go-spew v1.1.1 // indirect
1917
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2018
github.com/go-errors/errors v1.4.2 // indirect
21-
github.com/go-logr/logr v1.2.2 // indirect
22-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
23-
github.com/go-openapi/jsonreference v0.19.6 // indirect
24-
github.com/go-openapi/swag v0.21.1 // indirect
19+
github.com/go-logr/logr v1.2.4 // indirect
20+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
21+
github.com/go-openapi/jsonreference v0.20.2 // indirect
22+
github.com/go-openapi/swag v0.22.3 // indirect
2523
github.com/gogo/protobuf v1.3.2 // indirect
24+
github.com/golang/protobuf v1.5.3 // indirect
25+
github.com/google/gnostic v0.6.9 // indirect
2626
github.com/google/gofuzz v1.2.0 // indirect
2727
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
28-
github.com/imdario/mergo v0.3.12 // indirect
28+
github.com/imdario/mergo v0.3.15 // indirect
2929
github.com/josharian/intern v1.0.0 // indirect
3030
github.com/json-iterator/go v1.1.12 // indirect
3131
github.com/mailru/easyjson v0.7.7 // indirect
3232
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3333
github.com/modern-go/reflect2 v1.0.2 // indirect
3434
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
3535
github.com/pkg/errors v0.9.1 // indirect
36-
github.com/stretchr/testify v1.7.0 // indirect
37-
github.com/xlab/treeprint v1.1.0 // indirect
38-
go.starlark.net v0.0.0-20220213143740-c55a923347b1 // indirect
39-
golang.org/x/net v0.7.0 // indirect
40-
golang.org/x/sys v0.5.0 // indirect
41-
golang.org/x/text v0.7.0 // indirect
42-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
36+
github.com/stretchr/testify v1.8.2 // indirect
37+
github.com/xlab/treeprint v1.2.0 // indirect
38+
go.starlark.net v0.0.0-20230302034142-4b1e35fe2254 // indirect
39+
golang.org/x/net v0.9.0 // indirect
40+
golang.org/x/sys v0.7.0 // indirect
41+
golang.org/x/text v0.9.0 // indirect
42+
google.golang.org/protobuf v1.30.0 // indirect
4343
gopkg.in/inf.v0 v0.9.1 // indirect
4444
gopkg.in/yaml.v2 v2.4.0 // indirect
45-
k8s.io/klog/v2 v2.40.1 // indirect
46-
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
47-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
48-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
49-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
45+
k8s.io/klog/v2 v2.90.1 // indirect
46+
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect
47+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
48+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
49+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
5050
sigs.k8s.io/yaml v1.3.0 // indirect
5151
)

0 commit comments

Comments
 (0)