Skip to content

Commit cbfeab1

Browse files
rsevilla87rsevilla87
authored
Bump kube-burner to v2.6.0 (#424)
* Bump kube-burner to v2.6.0 Also updates Go version to 1.25, openshift/api and openshift/client-go to latest, and adds k8s.io replace directives matching upstream for kubevirt compatibility. Signed-off-by: Raul Sevilla <rsevilla@redhat.com> * Update golangci-lint Signed-off-by: Raul Sevilla <rsevilla@redhat.com> * Update golangci-lint Signed-off-by: Raul Sevilla <rsevilla@redhat.com> --------- Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
1 parent 11a0589 commit cbfeab1

File tree

14 files changed

+793
-273
lines changed

14 files changed

+793
-273
lines changed

‎.github/workflows/build-matrix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
ref: ${{ github.event.pull_request.head.sha }}
2323
persist-credentials: false
2424

25-
- name: Set up Go 1.23
25+
- name: Set up Go 1.25
2626
uses: actions/setup-go@v5
2727
with:
28-
go-version: 1.23
28+
go-version: 1.25
2929

3030
- name: Build
3131
env:

‎.github/workflows/builders.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
ref: ${{ github.event.pull_request.head.sha }}
1313
persist-credentials: false
1414

15-
- name: Set up Go 1.23
15+
- name: Set up Go 1.25
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.23
18+
go-version: 1.25
1919

2020
- name: Build code
2121
run: make build

‎.github/workflows/gorelease.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
fetch-depth: 0 # See: https://goreleaser.com/ci/actions/
1414
persist-credentials: false
1515

16-
- name: Set up Go 1.23
16+
- name: Set up Go 1.25
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.23
19+
go-version: 1.25
2020

2121
- name: Run GoReleaser
2222
uses: goreleaser/goreleaser-action@master

‎.github/workflows/linters.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
ref: ${{ github.event.pull_request.head.sha }}
1414
persist-credentials: false
1515

16-
- name: Set up Go 1.23
16+
- name: Set up Go 1.25
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.23
19+
go-version: 1.25
2020

2121
- name: Install pre-commit
2222
run: pip install pre-commit

‎.golangci.yml‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,39 @@
1-
run:
2-
timeout: 5m
3-
linters-settings:
4-
misspell:
5-
locale: US
1+
version: "2"
62
linters:
7-
disable-all: true
3+
default: none
84
enable:
9-
- nakedret
10-
- unused
11-
- misspell
12-
- ineffassign
13-
- goconst
14-
- goimports
155
- dupl
16-
- unparam
6+
- goconst
7+
- gocyclo
8+
- govet
9+
- ineffassign
10+
- misspell
11+
- nakedret
1712
- staticcheck
18-
- gosimple
1913
- unconvert
20-
- gocyclo
14+
- unparam
15+
- unused
16+
settings:
17+
misspell:
18+
locale: US
19+
exclusions:
20+
generated: lax
21+
presets:
22+
- comments
23+
- common-false-positives
24+
- legacy
25+
- std-error-handling
26+
paths:
27+
- third_party$
28+
- builtin$
29+
- examples$
30+
formatters:
31+
enable:
2132
- gofmt
22-
- govet
33+
- goimports
34+
exclusions:
35+
generated: lax
36+
paths:
37+
- third_party$
38+
- builtin$
39+
- examples$

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/golangci/golangci-lint
3-
rev: v1.60.3
3+
rev: v2.11.4
44
hooks:
55
- id: golangci-lint
66
entry: golangci-lint run

‎cmd/ocp.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ func openShiftCmd() *cobra.Command {
115115
ocpWorkloads.AdditionalVars["ES_SERVER"] = esServer
116116
ocpWorkloads.AdditionalVars["ES_INDEX"] = esIndex
117117
if alerting || esServer != "" || localIndexing {
118-
wh.Config.PrometheusURL, wh.Config.PrometheusToken, err = wh.MetadataAgent.GetPrometheus()
118+
wh.PrometheusURL, wh.PrometheusToken, err = wh.MetadataAgent.GetPrometheus()
119119
if err != nil {
120120
log.Fatalf("Error obtaining Prometheus token: %v", err)
121121
}
122-
log.Debugf("Obtained prometheus endpoint: %s", wh.Config.PrometheusURL)
122+
log.Debugf("Obtained prometheus endpoint: %s", wh.PrometheusURL)
123123
}
124124
}
125125
ocpWorkloads.SetVars, err = config.ParseSetValues(setValues)

‎go.mod‎

Lines changed: 111 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,162 @@
11
module github.com/kube-burner/kube-burner-ocp
22

3-
go 1.23.0
3+
go 1.25.0
44

5-
toolchain go1.23.4
5+
toolchain go1.25.9
66

77
require (
8-
github.com/cloud-bulldozer/go-commons/v2 v2.3.1
8+
github.com/cloud-bulldozer/go-commons/v2 v2.3.2
99
github.com/google/uuid v1.6.0
10-
github.com/kube-burner/kube-burner/v2 v2.5.1
11-
github.com/openshift/api v0.0.0-20240527133614-ba11c1587003
12-
github.com/openshift/client-go v0.0.0-20240821135114-75c118605d5f
10+
github.com/kube-burner/kube-burner/v2 v2.6.0
11+
github.com/openshift/api v0.0.0-20260408160412-464776f95207
12+
github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7
1313
github.com/praserx/ipconv v1.2.1
1414
github.com/prometheus-community/pro-bing v0.7.0
15-
github.com/sirupsen/logrus v1.9.3
16-
github.com/spf13/cobra v1.8.1
17-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
15+
github.com/sirupsen/logrus v1.9.4
16+
github.com/spf13/cobra v1.9.1
17+
github.com/spf13/pflag v1.0.10
1818
github.com/vishvananda/netlink v1.2.1-beta.2.0.20231024175852-77df5d35f725
19-
golang.org/x/sys v0.33.0
20-
k8s.io/api v0.31.1
21-
k8s.io/apimachinery v0.31.1
22-
k8s.io/client-go v0.31.1
19+
golang.org/x/sys v0.40.0
20+
k8s.io/api v0.35.2
21+
k8s.io/apimachinery v0.35.2
22+
k8s.io/client-go v0.35.2
2323
)
2424

2525
require (
26+
cloud.google.com/go/auth v0.18.1 // indirect
27+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
28+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
2629
dario.cat/mergo v1.0.1 // indirect
30+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
31+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
32+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
33+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
2734
github.com/Masterminds/goutils v1.1.1 // indirect
28-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
35+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2936
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
37+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
38+
github.com/aws/aws-sdk-go v1.55.5 // indirect
39+
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
40+
github.com/beorn7/perks v1.0.1 // indirect
41+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3042
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
43+
github.com/dennwc/varint v1.0.0 // indirect
3144
github.com/elastic/go-elasticsearch/v7 v7.13.1 // indirect
32-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
33-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
34-
github.com/go-kit/kit v0.13.0 // indirect
45+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
46+
github.com/felixge/httpsnoop v1.0.4 // indirect
47+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3548
github.com/go-kit/log v0.2.1 // indirect
3649
github.com/go-logfmt/logfmt v0.6.0 // indirect
37-
github.com/go-logr/logr v1.4.2 // indirect
38-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
39-
github.com/go-openapi/jsonreference v0.21.0 // indirect
40-
github.com/go-openapi/swag v0.23.0 // indirect
50+
github.com/go-logr/logr v1.4.3 // indirect
51+
github.com/go-logr/stdr v1.2.2 // indirect
52+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
53+
github.com/go-openapi/jsonreference v0.21.4 // indirect
54+
github.com/go-openapi/swag v0.25.4 // indirect
55+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
56+
github.com/go-openapi/swag/conv v0.25.4 // indirect
57+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
58+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
59+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
60+
github.com/go-openapi/swag/loading v0.25.4 // indirect
61+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
62+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
63+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
64+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
65+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
4166
github.com/gogo/protobuf v1.3.2 // indirect
42-
github.com/golang/glog v1.2.4 // indirect
43-
github.com/golang/mock v1.6.0 // indirect
44-
github.com/golang/protobuf v1.5.4 // indirect
45-
github.com/google/gnostic-models v0.6.9 // indirect
67+
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
68+
github.com/golang/snappy v1.0.0 // indirect
69+
github.com/google/gnostic-models v0.7.0 // indirect
4670
github.com/google/go-cmp v0.7.0 // indirect
47-
github.com/google/gofuzz v1.2.0 // indirect
48-
github.com/gorilla/websocket v1.5.0 // indirect
71+
github.com/google/s2a-go v0.1.9 // indirect
72+
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
73+
github.com/googleapis/gax-go/v2 v2.16.0 // indirect
74+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
75+
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
4976
github.com/huandu/xstrings v1.5.0 // indirect
50-
github.com/imdario/mergo v0.3.16 // indirect
5177
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5278
github.com/itchyny/gojq v0.12.16 // indirect
5379
github.com/itchyny/timefmt-go v0.1.6 // indirect
54-
github.com/josharian/intern v1.0.0 // indirect
80+
github.com/jmespath/go-jmespath v0.4.0 // indirect
81+
github.com/jpillora/backoff v1.0.0 // indirect
5582
github.com/json-iterator/go v1.1.12 // indirect
5683
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.6.0 // indirect
84+
github.com/klauspost/compress v1.18.3 // indirect
5785
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
58-
github.com/mailru/easyjson v0.9.0 // indirect
86+
github.com/kylelemons/godebug v1.1.0 // indirect
5987
github.com/mitchellh/copystructure v1.2.0 // indirect
6088
github.com/mitchellh/reflectwalk v1.0.2 // indirect
61-
github.com/moby/spdystream v0.4.0 // indirect
89+
github.com/moby/spdystream v0.5.0 // indirect
6290
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
63-
github.com/modern-go/reflect2 v1.0.2 // indirect
91+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6492
github.com/montanaflynn/stats v0.7.1 // indirect
6593
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
94+
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
6695
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
96+
github.com/oklog/ulid v1.3.1 // indirect
6797
github.com/opensearch-project/opensearch-go v1.1.0 // indirect
6898
github.com/openshift/custom-resource-status v1.1.2 // indirect
99+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
100+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
69101
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0 // indirect
70-
github.com/prometheus/client_golang v1.20.5 // indirect
71-
github.com/prometheus/client_model v0.6.1 // indirect
72-
github.com/prometheus/common v0.62.0 // indirect
102+
github.com/prometheus/client_golang v1.23.2 // indirect
103+
github.com/prometheus/client_model v0.6.2 // indirect
104+
github.com/prometheus/common v0.67.5 // indirect
105+
github.com/prometheus/common/sigv4 v0.1.0 // indirect
106+
github.com/prometheus/procfs v0.16.1 // indirect
107+
github.com/prometheus/prometheus v0.55.1 // indirect
73108
github.com/shopspring/decimal v1.4.0 // indirect
74109
github.com/spf13/cast v1.7.0 // indirect
110+
github.com/stretchr/testify v1.11.1 // indirect
75111
github.com/vishvananda/netns v0.0.4 // indirect
76112
github.com/x448/float16 v0.8.4 // indirect
77-
golang.org/x/crypto v0.39.0 // indirect
78-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
79-
golang.org/x/net v0.41.0 // indirect
80-
golang.org/x/oauth2 v0.30.0 // indirect
81-
golang.org/x/sync v0.15.0 // indirect
82-
golang.org/x/term v0.32.0 // indirect
83-
golang.org/x/text v0.26.0 // indirect
84-
golang.org/x/time v0.10.0 // indirect
85-
gonum.org/v1/gonum v0.15.1 // indirect
86-
google.golang.org/protobuf v1.36.6 // indirect
113+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
114+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
115+
go.opentelemetry.io/otel v1.40.0 // indirect
116+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
117+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
118+
go.uber.org/atomic v1.11.0 // indirect
119+
go.uber.org/goleak v1.3.0 // indirect
120+
go.uber.org/mock v0.5.1 // indirect
121+
go.yaml.in/yaml/v2 v2.4.3 // indirect
122+
go.yaml.in/yaml/v3 v3.0.4 // indirect
123+
golang.org/x/crypto v0.47.0 // indirect
124+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
125+
golang.org/x/net v0.49.0 // indirect
126+
golang.org/x/oauth2 v0.34.0 // indirect
127+
golang.org/x/sync v0.19.0 // indirect
128+
golang.org/x/term v0.39.0 // indirect
129+
golang.org/x/text v0.33.0 // indirect
130+
golang.org/x/time v0.14.0 // indirect
131+
gonum.org/v1/gonum v0.16.0 // indirect
132+
google.golang.org/api v0.265.0 // indirect
133+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
134+
google.golang.org/grpc v1.79.3 // indirect
135+
google.golang.org/protobuf v1.36.11 // indirect
136+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
87137
gopkg.in/inf.v0 v0.9.1 // indirect
88138
gopkg.in/yaml.v2 v2.4.0 // indirect
89139
gopkg.in/yaml.v3 v3.0.1 // indirect
90-
k8s.io/apiextensions-apiserver v0.31.1 // indirect
140+
k8s.io/apiextensions-apiserver v0.34.3 // indirect
91141
k8s.io/klog/v2 v2.130.1 // indirect
92142
k8s.io/kube-openapi v0.31.0 // indirect
93143
k8s.io/kubectl v0.30.3 // indirect
94-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
95-
kubevirt.io/api v1.4.0 // indirect
96-
kubevirt.io/client-go v1.4.0 // indirect
97-
kubevirt.io/containerized-data-importer-api v1.61.1 // indirect
98-
kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
99-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
100-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
101-
sigs.k8s.io/yaml v1.4.0 // indirect
144+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
145+
kubevirt.io/api v1.8.1 // indirect
146+
kubevirt.io/client-go v1.8.1 // indirect
147+
kubevirt.io/containerized-data-importer-api v1.64.0 // indirect
148+
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
149+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
150+
sigs.k8s.io/randfill v1.0.0 // indirect
151+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
152+
sigs.k8s.io/yaml v1.6.0 // indirect
102153
)
103154

104-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // Replacements are not inherited from dependencies, this replacement is required by kubevirt.io/client-go prevents updating this module accidentally
155+
replace (
156+
k8s.io/api => k8s.io/api v0.34.3
157+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.3
158+
k8s.io/client-go => k8s.io/client-go v0.34.3
159+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
160+
)
105161

106162
exclude github.com/kube-burner/kube-burner v1.20.6 // Published accidentally

0 commit comments

Comments
 (0)