Skip to content

Commit ace09a0

Browse files
authored
Merge pull request #137 from mattfenwick/go-1.21
move to go 1.21, update some deps
2 parents 87f54e0 + 4c2f031 commit ace09a0

10 files changed

+107
-428
lines changed

.github/workflows/go.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: '1.20'
18+
go-version: '1.21'
1919

2020
- name: Build
2121
run: go build -v ./cmd/cyclonus/main.go

.github/workflows/kind_antrea.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Go
2222
uses: actions/setup-go@v2
2323
with:
24-
go-version: '1.20'
24+
go-version: '1.21'
2525
- name: Run Cyclonus
2626
working-directory: hack/kind
2727
run: CNI=antrea RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.cyclonus_args }}" ./run-cyclonus.sh

.github/workflows/kind_calico.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: '1.20'
23+
go-version: '1.21'
2424
- name: Run Cyclonus
2525
working-directory: hack/kind
2626
run: CNI=calico RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.cyclonus_args }}" ./run-cyclonus.sh

.github/workflows/kind_cilium.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v2
2121
with:
22-
go-version: '1.20'
22+
go-version: '1.21'
2323
- name: Run Cyclonus
2424
working-directory: hack/kind
2525
run: CNI=cilium RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.cyclonus_args }}" ./run-cyclonus.sh

.github/workflows/kind_cni_from_source.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: '1.20'
23+
go-version: '1.21'
2424

2525
- name: Run Cyclonus
2626
working-directory: hack/kind

.github/workflows/kind_ovn.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v2
2424
with:
25-
go-version: '1.20'
25+
go-version: '1.21'
2626
- name: Run Cyclonus
2727
working-directory: hack/kind
2828
run: CNI=ovn-kubernetes RUN_FROM_SOURCE=true FROM_SOURCE_ARGS="${{ github.event.inputs.cyclonus_args }}" ./run-cyclonus.sh

docs/developer-guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Setup
44

5-
- [Get set up with golang 1.20](https://golang.org/dl/)
5+
- [Get set up with golang 1.21](https://golang.org/dl/)
66
- clone this repo
77

88
git clone [email protected]:mattfenwick/cyclonus.git

go.mod

+28-27
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,65 @@
11
module github.com/mattfenwick/cyclonus
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/go-resty/resty/v2 v2.7.0
77
github.com/jstemmer/go-junit-report v0.9.1
8-
github.com/mattfenwick/collections v0.2.4
8+
github.com/mattfenwick/collections v0.2.5
99
github.com/olekukonko/tablewriter v0.0.5
10-
github.com/onsi/ginkgo/v2 v2.9.2
11-
github.com/onsi/gomega v1.27.6
10+
github.com/onsi/ginkgo/v2 v2.12.0
11+
github.com/onsi/gomega v1.27.10
1212
github.com/pkg/errors v0.9.1
13-
github.com/sirupsen/logrus v1.9.0
13+
github.com/sirupsen/logrus v1.9.3
1414
github.com/spf13/cobra v1.7.0
1515
golang.org/x/exp v0.0.0-20220706164943-b4a6d9510983
16-
k8s.io/api v0.26.3
17-
k8s.io/apimachinery v0.26.3
18-
k8s.io/client-go v0.26.3
16+
k8s.io/api v0.28.1
17+
k8s.io/apimachinery v0.28.1
18+
k8s.io/client-go v0.28.1
1919
sigs.k8s.io/yaml v1.3.0
2020
)
2121

2222
require (
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
25-
github.com/go-logr/logr v1.2.3 // indirect
26-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
27-
github.com/go-openapi/jsonreference v0.20.0 // indirect
28-
github.com/go-openapi/swag v0.19.14 // indirect
25+
github.com/go-logr/logr v1.2.4 // indirect
26+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
27+
github.com/go-openapi/jsonreference v0.20.2 // indirect
28+
github.com/go-openapi/swag v0.22.3 // indirect
2929
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3030
github.com/gogo/protobuf v1.3.2 // indirect
3131
github.com/golang/protobuf v1.5.3 // indirect
32-
github.com/google/gnostic v0.5.7-v3refs // indirect
32+
github.com/google/gnostic-models v0.6.8 // indirect
3333
github.com/google/go-cmp v0.5.9 // indirect
34-
github.com/google/gofuzz v1.1.0 // indirect
34+
github.com/google/gofuzz v1.2.0 // indirect
3535
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
36+
github.com/google/uuid v1.3.0 // indirect
3637
github.com/imdario/mergo v0.3.11 // indirect
3738
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3839
github.com/josharian/intern v1.0.0 // indirect
3940
github.com/json-iterator/go v1.1.12 // indirect
40-
github.com/mailru/easyjson v0.7.6 // indirect
41+
github.com/mailru/easyjson v0.7.7 // indirect
4142
github.com/mattn/go-runewidth v0.0.9 // indirect
4243
github.com/moby/spdystream v0.2.0 // indirect
4344
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4445
github.com/modern-go/reflect2 v1.0.2 // indirect
4546
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4647
github.com/spf13/pflag v1.0.5 // indirect
47-
golang.org/x/net v0.8.0 // indirect
48-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
49-
golang.org/x/sys v0.6.0 // indirect
50-
golang.org/x/term v0.6.0 // indirect
51-
golang.org/x/text v0.8.0 // indirect
52-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
53-
golang.org/x/tools v0.7.0 // indirect
48+
golang.org/x/net v0.14.0 // indirect
49+
golang.org/x/oauth2 v0.8.0 // indirect
50+
golang.org/x/sys v0.11.0 // indirect
51+
golang.org/x/term v0.11.0 // indirect
52+
golang.org/x/text v0.12.0 // indirect
53+
golang.org/x/time v0.3.0 // indirect
54+
golang.org/x/tools v0.12.0 // indirect
5455
google.golang.org/appengine v1.6.7 // indirect
55-
google.golang.org/protobuf v1.28.1 // indirect
56+
google.golang.org/protobuf v1.30.0 // indirect
5657
gopkg.in/inf.v0 v0.9.1 // indirect
5758
gopkg.in/yaml.v2 v2.4.0 // indirect
5859
gopkg.in/yaml.v3 v3.0.1 // indirect
59-
k8s.io/klog/v2 v2.80.1 // indirect
60-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
61-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
62-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
60+
k8s.io/klog/v2 v2.100.1 // indirect
61+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
62+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
63+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6364
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6465
)

0 commit comments

Comments
 (0)