Skip to content

Commit 58d1485

Browse files
dependabot[bot]dependabot[bot]
authored
Bump the onsi group with 2 updates (#539)
Bumps the onsi group with 2 updates: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) and [github.com/onsi/gomega](https://github.com/onsi/gomega). Updates `github.com/onsi/ginkgo/v2` from 2.23.0 to 2.23.3 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.23.0...v2.23.3) Updates `github.com/onsi/gomega` from 1.36.2 to 1.36.3 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.36.2...v1.36.3) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: onsi - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch dependency-group: onsi ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 220a035 commit 58d1485

File tree

8 files changed

+76
-71
lines changed

8 files changed

+76
-71
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ jobs:
2020
with:
2121
go-version-file: "go.mod"
2222

23-
- name: golangci-lint
24-
uses: golangci/golangci-lint-action@v6
25-
with:
26-
skip-cache: true
23+
- name: Lint
24+
run: make lint
25+
2726
build:
2827
name: Go Tests
2928
runs-on: ubuntu-latest

‎.golangci.yaml‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,42 @@
1-
run:
2-
timeout: 5m
3-
1+
version: "2"
42
linters:
53
enable:
6-
- asciicheck
7-
- bodyclose
8-
- dogsled
9-
- durationcheck
10-
- errcheck
11-
- errorlint
12-
- gci
13-
- gofmt
14-
- gofumpt
15-
- goimports
16-
- gosec
17-
- gosimple
18-
- govet
19-
- importas
20-
- ineffassign
21-
- misspell
22-
- nakedret
23-
- nolintlint
24-
- staticcheck
25-
- unconvert
26-
- unparam
27-
- unused
28-
- wastedassign
29-
linters-settings:
30-
gosec:
31-
# Exclude generated files
32-
exclude-generated: true
33-
gofmt:
34-
# simplify code: gofmt with `-s` option, true by default
35-
simplify: true
36-
4+
- asciicheck
5+
- bodyclose
6+
- dogsled
7+
- durationcheck
8+
- errorlint
9+
- gosec
10+
- importas
11+
- misspell
12+
- nakedret
13+
- nolintlint
14+
- unconvert
15+
- unparam
16+
- wastedassign
17+
exclusions:
18+
generated: lax
19+
presets:
20+
- comments
21+
- common-false-positives
22+
- legacy
23+
- std-error-handling
24+
paths:
25+
- third_party$
26+
- builtin$
27+
- examples$
28+
formatters:
29+
enable:
30+
- gci
31+
- gofmt
32+
- gofumpt
33+
- goimports
34+
settings:
35+
gofmt:
36+
simplify: true
37+
exclusions:
38+
generated: lax
39+
paths:
40+
- third_party$
41+
- builtin$
42+
- examples$

‎.toolbox.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ TB_MOCKGEN ?= $(TB_LOCALBIN)/mockgen
1717
TB_SEMVER ?= $(TB_LOCALBIN)/semver
1818

1919
## Tool Versions
20-
TB_GOLANGCI_LINT_VERSION ?= v1.63.4
21-
TB_GORELEASER_VERSION ?= v2.5.1
20+
TB_GOLANGCI_LINT_VERSION ?= v2.0.1
21+
TB_GORELEASER_VERSION ?= v2.8.1
2222
TB_HELM_DOCS_VERSION ?= v1.14.2
2323
TB_MOCKGEN_VERSION ?= v0.5.0
2424
TB_SEMVER_VERSION ?= v1.1.3
@@ -31,7 +31,7 @@ $(TB_GINKGO): $(TB_LOCALBIN)
3131
.PHONY: tb.golangci-lint
3232
tb.golangci-lint: $(TB_GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
3333
$(TB_GOLANGCI_LINT): $(TB_LOCALBIN)
34-
test -s $(TB_LOCALBIN)/golangci-lint || GOBIN=$(TB_LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(TB_GOLANGCI_LINT_VERSION)
34+
test -s $(TB_LOCALBIN)/golangci-lint || GOBIN=$(TB_LOCALBIN) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(TB_GOLANGCI_LINT_VERSION)
3535
.PHONY: tb.goreleaser
3636
tb.goreleaser: $(TB_GORELEASER) ## Download goreleaser locally if necessary.
3737
$(TB_GORELEASER): $(TB_LOCALBIN)
@@ -64,7 +64,7 @@ tb.reset:
6464
.PHONY: tb.update
6565
tb.update: tb.reset
6666
toolbox makefile -f $(TB_LOCALDIR)/Makefile \
67-
github.com/golangci/golangci-lint/cmd/golangci-lint \
67+
github.com/golangci/golangci-lint/v2/cmd/golangci-lint \
6868
github.com/goreleaser/goreleaser/v2 \
6969
github.com/norwoodj/helm-docs/cmd/helm-docs \
7070
go.uber.org/mock/[email protected]/uber/mock \

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tidy:
1717
test: tb.ginkgo tidy mocks
1818
$(TB_GINKGO) --cover -r -output-dir=. -coverprofile=coverage.out
1919

20-
lint: golangci-lint
20+
lint: tb.golangci-lint
2121
$(TB_GOLANGCI_LINT) run --fix
2222

2323
# Run tests

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
github.com/go-logr/zapr v1.3.0
1010
github.com/go-playground/validator/v10 v10.25.0
1111
github.com/google/uuid v1.6.0
12-
github.com/onsi/ginkgo/v2 v2.23.0
13-
github.com/onsi/gomega v1.36.2
12+
github.com/onsi/ginkgo/v2 v2.23.3
13+
github.com/onsi/gomega v1.36.3
1414
github.com/prometheus/client_golang v1.21.1
1515
github.com/prometheus/common v0.63.0
1616
github.com/robfig/cron/v3 v3.0.1
@@ -74,13 +74,13 @@ require (
7474
github.com/x448/float16 v0.8.4 // indirect
7575
go.uber.org/multierr v1.11.0 // indirect
7676
golang.org/x/arch v0.8.0 // indirect
77-
golang.org/x/crypto v0.35.0 // indirect
78-
golang.org/x/net v0.36.0 // indirect
77+
golang.org/x/crypto v0.36.0 // indirect
78+
golang.org/x/net v0.37.0 // indirect
7979
golang.org/x/oauth2 v0.25.0 // indirect
80-
golang.org/x/sync v0.11.0 // indirect
81-
golang.org/x/sys v0.30.0 // indirect
82-
golang.org/x/term v0.29.0 // indirect
83-
golang.org/x/text v0.22.0 // indirect
80+
golang.org/x/sync v0.12.0 // indirect
81+
golang.org/x/sys v0.31.0 // indirect
82+
golang.org/x/term v0.30.0 // indirect
83+
golang.org/x/text v0.23.0 // indirect
8484
golang.org/x/time v0.7.0 // indirect
8585
golang.org/x/tools v0.30.0 // indirect
8686
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

‎go.sum‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
109109
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
110110
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
111111
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
112-
github.com/onsi/ginkgo/v2 v2.23.0 h1:FA1xjp8ieYDzlgS5ABTpdUDB7wtngggONc8a7ku2NqQ=
113-
github.com/onsi/ginkgo/v2 v2.23.0/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
114-
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
115-
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
112+
github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0=
113+
github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
114+
github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU=
115+
github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
116116
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
117117
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
118118
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -169,37 +169,37 @@ golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
169169
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
170170
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
171171
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
172-
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
173-
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
172+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
173+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
174174
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
175175
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
176176
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
177177
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
178178
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
179179
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
180180
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
181-
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
182-
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
181+
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
182+
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
183183
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
184184
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
185185
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
186186
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
187187
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
188-
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
189-
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
188+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
189+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
190190
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
191191
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
192192
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
193193
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
194194
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
195-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
196-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
197-
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
198-
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
195+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
196+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
197+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
198+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
199199
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
200200
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
201-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
202-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
201+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
202+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
203203
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
204204
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
205205
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎pkg/cron/cron.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ func (j *cronJob) startPods() {
138138

139139
jobLog.Info("executing job")
140140
for _, n := range nodes {
141-
pod, err := job.New(j.cfg, n.ObjectMeta.Name, executionID, callbackAddress, j.cfg.Owner, j.extender...)
141+
pod, err := job.New(j.cfg, n.Name, executionID, callbackAddress, j.cfg.Owner, j.extender...)
142142
if err != nil {
143143
jobLog.Error(err, "error creating pod from template")
144144
return
145145
}
146146

147147
_ = j.controller.AddPod(&podJob{
148148
id: executionID,
149-
nodeName: n.ObjectMeta.Name,
149+
nodeName: n.Name,
150150
log: jobLog,
151151
client: j.client,
152152
pod: pod,

‎pkg/job/job.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ func New(cfg *config.Config, nodeName, id, callbackAddress string, owner runtime
8686
return nil, err
8787
}
8888

89-
pod.ObjectMeta.Name = podName
90-
pod.ObjectMeta.Namespace = cfg.Namespace
89+
pod.Name = podName
90+
pod.Namespace = cfg.Namespace
9191

9292
// assure correct labels
9393
pod.Labels[controller.LabelExecutionID] = id

0 commit comments

Comments
 (0)