Skip to content

Commit a5245cb

Browse files
mattfenwickmattfenwick
authored
Merge pull request #140 from mattfenwick/go-1.22
move to go 1.22
2 parents 287a7d9 + 04e01b9 commit a5245cb

12 files changed

+99
-97
lines changed

‎.github/workflows/go.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

1515
- name: Set up Go
16-
uses: actions/setup-go@v2
16+
uses: actions/setup-go@v5
1717
with:
18-
go-version: '1.21'
18+
go-version: '1.22'
1919

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

‎.github/workflows/kind_antrea.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
name: Run Cyclonus on KinD/Antrea
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2121
- name: Set up Go
22-
uses: actions/setup-go@v2
22+
uses: actions/setup-go@v5
2323
with:
24-
go-version: '1.21'
24+
go-version: '1.22'
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
name: Run Cyclonus on KinD/Calico
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020
- name: Set up Go
21-
uses: actions/setup-go@v2
21+
uses: actions/setup-go@v5
2222
with:
23-
go-version: '1.21'
23+
go-version: '1.22'
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
name: Run Cyclonus on KinD/Cilium
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919
- name: Set up Go
20-
uses: actions/setup-go@v2
20+
uses: actions/setup-go@v5
2121
with:
22-
go-version: '1.21'
22+
go-version: '1.22'
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_job.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Run Cyclonus on KinD
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Run Cyclonus
1717
working-directory: hack/kind

‎.github/workflows/kind_cni_from_source.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
name: Run Cyclonus on KinD
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919

2020
- name: Set up Go
21-
uses: actions/setup-go@v2
21+
uses: actions/setup-go@v5
2222
with:
23-
go-version: '1.21'
23+
go-version: '1.22'
2424

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

‎.github/workflows/kind_ovn.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
timeout-minutes: 250
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
- name: Set up Go
23-
uses: actions/setup-go@v2
23+
uses: actions/setup-go@v5
2424
with:
25-
go-version: '1.21'
25+
go-version: '1.22'
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.21](https://golang.org/dl/)
5+
- [Get set up with golang 1.22](https://golang.org/dl/)
66
- clone this repo
77

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

‎go.mod

+27-23
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,42 @@
11
module github.com/mattfenwick/cyclonus
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.5
46

57
require (
68
github.com/go-resty/resty/v2 v2.7.0
79
github.com/jstemmer/go-junit-report v0.9.1
8-
github.com/mattfenwick/collections v0.2.5
10+
github.com/mattfenwick/collections v0.3.2
911
github.com/olekukonko/tablewriter v0.0.5
10-
github.com/onsi/ginkgo/v2 v2.12.0
11-
github.com/onsi/gomega v1.27.10
12+
github.com/onsi/ginkgo/v2 v2.15.0
13+
github.com/onsi/gomega v1.31.0
1214
github.com/pkg/errors v0.9.1
1315
github.com/sirupsen/logrus v1.9.3
1416
github.com/spf13/cobra v1.7.0
15-
golang.org/x/exp v0.0.0-20220706164943-b4a6d9510983
16-
k8s.io/api v0.28.1
17-
k8s.io/apimachinery v0.28.1
18-
k8s.io/client-go v0.28.1
17+
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
18+
k8s.io/api v0.30.2
19+
k8s.io/apimachinery v0.30.2
20+
k8s.io/client-go v0.30.2
1921
sigs.k8s.io/yaml v1.3.0
2022
)
2123

2224
require (
2325
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
25-
github.com/go-logr/logr v1.2.4 // indirect
26+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
27+
github.com/go-logr/logr v1.4.1 // indirect
2628
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2729
github.com/go-openapi/jsonreference v0.20.2 // indirect
2830
github.com/go-openapi/swag v0.22.3 // indirect
2931
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3032
github.com/gogo/protobuf v1.3.2 // indirect
31-
github.com/golang/protobuf v1.5.3 // indirect
33+
github.com/golang/protobuf v1.5.4 // indirect
3234
github.com/google/gnostic-models v0.6.8 // indirect
33-
github.com/google/go-cmp v0.5.9 // indirect
35+
github.com/google/go-cmp v0.6.0 // indirect
3436
github.com/google/gofuzz v1.2.0 // indirect
3537
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
3638
github.com/google/uuid v1.3.0 // indirect
39+
github.com/gorilla/websocket v1.5.0 // indirect
3740
github.com/imdario/mergo v0.3.11 // indirect
3841
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3942
github.com/josharian/intern v1.0.0 // indirect
@@ -44,22 +47,23 @@ require (
4447
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4548
github.com/modern-go/reflect2 v1.0.2 // indirect
4649
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
50+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
4751
github.com/spf13/pflag v1.0.5 // 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
52+
golang.org/x/net v0.23.0 // indirect
53+
golang.org/x/oauth2 v0.10.0 // indirect
54+
golang.org/x/sys v0.18.0 // indirect
55+
golang.org/x/term v0.18.0 // indirect
56+
golang.org/x/text v0.14.0 // indirect
5357
golang.org/x/time v0.3.0 // indirect
54-
golang.org/x/tools v0.12.0 // indirect
58+
golang.org/x/tools v0.18.0 // indirect
5559
google.golang.org/appengine v1.6.7 // indirect
56-
google.golang.org/protobuf v1.30.0 // indirect
60+
google.golang.org/protobuf v1.33.0 // indirect
5761
gopkg.in/inf.v0 v0.9.1 // indirect
5862
gopkg.in/yaml.v2 v2.4.0 // indirect
5963
gopkg.in/yaml.v3 v3.0.1 // 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
64+
k8s.io/klog/v2 v2.120.1 // indirect
65+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
66+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
6367
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
64-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
68+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6569
)

0 commit comments

Comments
 (0)