Skip to content

Commit f8fb562

Browse files
authored
Merge pull request #108 from grafana/paul/upgrades
Upgrading dependencies and CI
2 parents b78303c + a1a6640 commit f8fb562

File tree

5 files changed

+1182
-125
lines changed

5 files changed

+1182
-125
lines changed

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
- name: Install Go
24-
uses: actions/setup-go@v3
24+
uses: actions/setup-go@v4
2525
with:
26-
go-version: 1.20.x
26+
go-version: 1.21.x
2727
- name: Check build
2828
run: |
2929
go version
@@ -41,20 +41,20 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
go-version: [1.19.x, 1.20.x, tip]
44+
go-version: [1.20.x, 1.21.x, tip]
4545
platform: [ubuntu-latest, windows-latest]
4646
runs-on: ${{ matrix.platform }}
4747
steps:
4848
- name: Checkout code
49-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
5050
- name: Install Go ${{ matrix.go-version }}
5151
if: matrix.go-version != 'tip'
52-
uses: actions/setup-go@v3
52+
uses: actions/setup-go@v4
5353
with:
5454
go-version: ${{ matrix.go-version }}
5555
- name: Install Go stable
5656
if: matrix.go-version == 'tip'
57-
uses: actions/setup-go@v3
57+
uses: actions/setup-go@v4
5858
with:
5959
go-version: 1.x
6060
- name: Install Go tip

.github/workflows/linter.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout code
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Install Go
14-
uses: actions/setup-go@v3
14+
uses: actions/setup-go@v4
1515
with:
16-
go-version: 1.20.x
16+
go-version: 1.21.x
1717
- name: Check module dependencies
1818
run: |
1919
go version
@@ -24,13 +24,13 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0
3030
- name: Install Go
31-
uses: actions/setup-go@v3
31+
uses: actions/setup-go@v4
3232
with:
33-
go-version: 1.20.x
33+
go-version: 1.21.x
3434
- name: Retrieve golangci-lint version
3535
run: |
3636
echo "Version=$(head -n 1 "${GITHUB_WORKSPACE}/.golangci.yml" | tr -d '# ')" >> $GITHUB_OUTPUT

.golangci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# v1.52.2
1+
# v1.55.2
22
# Please don't remove the first line. It is used in CI to determine the golangci version
33
run:
44
deadline: 5m
@@ -25,8 +25,8 @@ issues:
2525
- funlen
2626
- lll
2727
- linters:
28-
- paralleltest # false positive: https://github.com/kunwardeep/paralleltest/issues/8.
29-
text: "does not use range value in test Run"
28+
- staticcheck # Tracked in https://github.com/grafana/xk6-grpc/issues/14
29+
text: "The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated."
3030
- linters:
3131
- forbidigo
3232
text: 'use of `os\.(SyscallError|Signal|Interrupt)` forbidden'
@@ -69,7 +69,6 @@ linters:
6969
- bodyclose
7070
- contextcheck
7171
- cyclop
72-
- depguard
7372
- dogsled
7473
- dupl
7574
- durationcheck
@@ -97,6 +96,7 @@ linters:
9796
- govet
9897
- importas
9998
- ineffassign
99+
- interfacebloat
100100
- lll
101101
- makezero
102102
- misspell

go.mod

+48-33
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,46 @@ module github.com/grafana/xk6-kubernetes
33
go 1.19
44

55
require (
6-
go.k6.io/k6 v0.45.1
7-
k8s.io/api v0.27.1
8-
k8s.io/apimachinery v0.27.1
9-
k8s.io/client-go v0.27.1
6+
go.k6.io/k6 v0.48.0
7+
k8s.io/api v0.27.8
8+
k8s.io/apimachinery v0.27.8
9+
k8s.io/client-go v0.27.8
1010
)
1111

1212
require (
13-
github.com/dop251/goja v0.0.0-20230531210528-d7324b2d74f7
14-
github.com/sirupsen/logrus v1.9.0
15-
github.com/stretchr/testify v1.8.2
13+
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
14+
github.com/sirupsen/logrus v1.9.3
15+
github.com/stretchr/testify v1.8.4
1616
)
1717

1818
require (
19+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
1920
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/dlclark/regexp2 v1.9.0 // indirect
21-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
22-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
23-
github.com/fatih/color v1.15.0 // indirect
24-
github.com/go-logr/logr v1.2.4 // indirect
25-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
21+
github.com/dlclark/regexp2 v1.10.0 // indirect
22+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
23+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
24+
github.com/fatih/color v1.16.0 // indirect
25+
github.com/go-logr/logr v1.3.0 // indirect
26+
github.com/go-logr/stdr v1.2.2 // indirect
27+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
2628
github.com/go-openapi/jsonreference v0.20.2 // indirect
27-
github.com/go-openapi/swag v0.22.3 // indirect
29+
github.com/go-openapi/swag v0.22.4 // indirect
2830
github.com/go-sourcemap/sourcemap v2.1.4-0.20211119122758-180fcef48034+incompatible // indirect
2931
github.com/gogo/protobuf v1.3.2 // indirect
3032
github.com/golang/protobuf v1.5.3 // indirect
31-
github.com/google/gnostic v0.6.9 // indirect
32-
github.com/google/go-cmp v0.5.9 // indirect
33+
github.com/google/gnostic v0.7.0 // indirect
34+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
3335
github.com/google/gofuzz v1.2.0 // indirect
34-
github.com/google/pprof v0.0.0-20230426061923-93006964c1fc // indirect
35-
github.com/google/uuid v1.3.0 // indirect
36-
github.com/imdario/mergo v0.3.15 // indirect
36+
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
37+
github.com/google/uuid v1.5.0 // indirect
38+
github.com/gorilla/websocket v1.5.1 // indirect
39+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
40+
github.com/imdario/mergo v0.3.16 // indirect
3741
github.com/josharian/intern v1.0.0 // indirect
3842
github.com/json-iterator/go v1.1.12 // indirect
3943
github.com/mailru/easyjson v0.7.7 // indirect
4044
github.com/mattn/go-colorable v0.1.13 // indirect
41-
github.com/mattn/go-isatty v0.0.18 // indirect
45+
github.com/mattn/go-isatty v0.0.20 // indirect
4246
github.com/moby/spdystream v0.2.0 // indirect
4347
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4448
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -48,24 +52,35 @@ require (
4852
github.com/pkg/errors v0.9.1 // indirect
4953
github.com/pmezard/go-difflib v1.0.0 // indirect
5054
github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e // indirect
51-
github.com/spf13/afero v1.9.5 // indirect
55+
github.com/spf13/afero v1.11.0 // indirect
5256
github.com/spf13/pflag v1.0.5 // indirect
53-
golang.org/x/net v0.10.0 // indirect
54-
golang.org/x/oauth2 v0.7.0 // indirect
55-
golang.org/x/sys v0.8.0 // indirect
56-
golang.org/x/term v0.8.0 // indirect
57-
golang.org/x/text v0.9.0 // indirect
58-
golang.org/x/time v0.3.0 // indirect
59-
google.golang.org/appengine v1.6.7 // indirect
57+
go.opentelemetry.io/otel v1.21.0 // indirect
58+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
59+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
60+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
61+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
62+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
63+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
64+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
65+
golang.org/x/net v0.19.0 // indirect
66+
golang.org/x/oauth2 v0.15.0 // indirect
67+
golang.org/x/sys v0.15.0 // indirect
68+
golang.org/x/term v0.15.0 // indirect
69+
golang.org/x/text v0.14.0 // indirect
70+
golang.org/x/time v0.5.0 // indirect
71+
google.golang.org/appengine v1.6.8 // indirect
72+
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
73+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
74+
google.golang.org/grpc v1.60.0 // indirect
6075
google.golang.org/protobuf v1.31.0 // indirect
6176
gopkg.in/guregu/null.v3 v3.5.0 // indirect
6277
gopkg.in/inf.v0 v0.9.1 // indirect
6378
gopkg.in/yaml.v2 v2.4.0 // indirect
6479
gopkg.in/yaml.v3 v3.0.1 // indirect
65-
k8s.io/klog/v2 v2.90.1 // indirect
66-
k8s.io/kube-openapi v0.0.0-20230426210814-b0c0aaee3cc0 // indirect
67-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
80+
k8s.io/klog/v2 v2.110.1 // indirect
81+
k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8 // indirect
82+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
6883
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
69-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
70-
sigs.k8s.io/yaml v1.3.0 // indirect
84+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
85+
sigs.k8s.io/yaml v1.4.0 // indirect
7186
)

0 commit comments

Comments
 (0)