Skip to content

Commit 748f08e

Browse files
fix(deps): update module sigs.k8s.io/controller-runtime to v0.18.2 (#181)
* fix(deps): update module sigs.k8s.io/controller-runtime to v0.17.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module sigs.k8s.io/controller-runtime to v0.18.2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * refactor: propagate contexts Signed-off-by: Tyler Gillson <[email protected]> * chore: go mod tidy Signed-off-by: Tyler Gillson <[email protected]> * chore: go mod tidy Signed-off-by: Tyler Gillson <[email protected]> * chore: bump controller-gen version Signed-off-by: Tyler Gillson <[email protected]> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Tyler Gillson <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tyler Gillson <[email protected]>
1 parent 0dd0f91 commit 748f08e

8 files changed

+90
-84
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
149149

150150
## Tool Versions
151151
CHART_VERSION=v0.0.1 # x-release-please-version
152-
CONTROLLER_TOOLS_VERSION ?= v0.12.0
152+
CONTROLLER_TOOLS_VERSION ?= v0.15.0
153153
ENVTEST_K8S_VERSION = 1.27.1
154154
HELM_VERSION=v3.10.1
155155
KUSTOMIZE_VERSION ?= v5.2.1

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/validation.spectrocloud.labs_validationresults.yaml

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: validationresults.validation.spectrocloud.labs
88
spec:
99
group: validation.spectrocloud.labs
@@ -33,14 +33,19 @@ spec:
3333
description: ValidationResult is the Schema for the validationresults API
3434
properties:
3535
apiVersion:
36-
description: 'APIVersion defines the versioned schema of this representation
37-
of an object. Servers should convert recognized schemas to the latest
38-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
36+
description: |-
37+
APIVersion defines the versioned schema of this representation of an object.
38+
Servers should convert recognized schemas to the latest internal value, and
39+
may reject unrecognized values.
40+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3941
type: string
4042
kind:
41-
description: 'Kind is a string value representing the REST resource this
42-
object represents. Servers may infer this from the endpoint the client
43-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
43+
description: |-
44+
Kind is a string value representing the REST resource this object represents.
45+
Servers may infer this from the endpoint the client submits requests to.
46+
Cannot be updated.
47+
In CamelCase.
48+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4449
type: string
4550
metadata:
4651
type: object
@@ -67,37 +72,37 @@ spec:
6772
operational state.
6873
properties:
6974
lastTransitionTime:
70-
description: Last time the condition transitioned from one status
71-
to another. This should be when the underlying condition changed.
72-
If that is not known, then using the time when the API field
73-
changed is acceptable.
75+
description: |-
76+
Last time the condition transitioned from one status to another.
77+
This should be when the underlying condition changed. If that is not known, then using the time when
78+
the API field changed is acceptable.
7479
format: date-time
7580
type: string
7681
message:
77-
description: A human readable message indicating details about
78-
the transition. This field may be empty.
82+
description: |-
83+
A human readable message indicating details about the transition.
84+
This field may be empty.
7985
type: string
8086
reason:
81-
description: The reason for the condition's last transition
82-
in CamelCase. The specific API may choose whether or not this
83-
field is considered a guaranteed API. This field may not be
84-
empty.
87+
description: |-
88+
The reason for the condition's last transition in CamelCase.
89+
The specific API may choose whether or not this field is considered a guaranteed API.
90+
This field may not be empty.
8591
type: string
8692
severity:
87-
description: Severity provides an explicit classification of
88-
Reason code, so the users or machines can immediately understand
89-
the current situation and act accordingly. The Severity field
90-
MUST be set only when Status=False.
93+
description: |-
94+
Severity provides an explicit classification of Reason code, so the users or machines can immediately
95+
understand the current situation and act accordingly.
96+
The Severity field MUST be set only when Status=False.
9197
type: string
9298
status:
9399
description: Status of the condition, one of True, False, Unknown.
94100
type: string
95101
type:
96-
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
97-
Many .condition.type values are consistent across resources
98-
like Available, but because arbitrary conditions can be useful
99-
(see .node.status.conditions), the ability to deconflict is
100-
important.
102+
description: |-
103+
Type of condition in CamelCase or in foo.example.com/CamelCase.
104+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
105+
can be useful (see .node.status.conditions), the ability to deconflict is important.
101106
type: string
102107
required:
103108
- lastTransitionTime

config/crd/bases/validation.spectrocloud.labs_validatorconfigs.yaml

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.12.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: validatorconfigs.validation.spectrocloud.labs
88
spec:
99
group: validation.spectrocloud.labs
@@ -20,14 +20,19 @@ spec:
2020
description: ValidatorConfig is the Schema for the validatorconfigs API
2121
properties:
2222
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2628
type: string
2729
kind:
28-
description: 'Kind is a string value representing the REST resource this
29-
object represents. Servers may infer this from the endpoint the client
30-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3136
type: string
3237
metadata:
3338
type: object
@@ -86,15 +91,16 @@ spec:
8691
items:
8792
properties:
8893
lastUpdatedTime:
89-
description: Last time the condition transitioned from one status
90-
to another. This should be when the underlying condition changed.
91-
If that is not known, then using the time when the API field
92-
changed is acceptable.
94+
description: |-
95+
Last time the condition transitioned from one status to another.
96+
This should be when the underlying condition changed. If that is not known, then using the time when
97+
the API field changed is acceptable.
9398
format: date-time
9499
type: string
95100
message:
96-
description: A human readable message indicating details about
97-
the transition. This field may be empty.
101+
description: |-
102+
A human readable message indicating details about the transition.
103+
This field may be empty.
98104
type: string
99105
pluginName:
100106
description: Name of the Validator plugin.
@@ -103,11 +109,10 @@ spec:
103109
description: Status of the condition, one of True, False, Unknown.
104110
type: string
105111
type:
106-
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
107-
Many .condition.type values are consistent across resources
108-
like Available, but because arbitrary conditions can be useful
109-
(see .node.status.conditions), the ability to deconflict is
110-
important.
112+
description: |-
113+
Type of condition in CamelCase or in foo.example.com/CamelCase.
114+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
115+
can be useful (see .node.status.conditions), the ability to deconflict is important.
111116
type: string
112117
required:
113118
- lastUpdatedTime

go.mod

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/validator-labs/validator
22

3-
go 1.21.6
3+
go 1.22.0
4+
5+
toolchain go1.22.3
46

57
require (
68
buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.15.0-20240205164452-95dfd137cb54.1
@@ -12,12 +14,12 @@ require (
1214
github.com/pkg/errors v0.9.1
1315
github.com/slack-go/slack v0.12.5
1416
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
15-
k8s.io/api v0.29.3
16-
k8s.io/apimachinery v0.29.3
17-
k8s.io/client-go v0.29.3
17+
k8s.io/api v0.30.1
18+
k8s.io/apimachinery v0.30.1
19+
k8s.io/client-go v0.30.1
1820
k8s.io/klog/v2 v2.120.1
1921
sigs.k8s.io/cluster-api v1.7.2
20-
sigs.k8s.io/controller-runtime v0.17.3
22+
sigs.k8s.io/controller-runtime v0.18.3
2123
sigs.k8s.io/yaml v1.4.0
2224
)
2325

@@ -65,16 +67,15 @@ require (
6567
golang.org/x/term v0.19.0 // indirect
6668
golang.org/x/text v0.14.0 // indirect
6769
golang.org/x/time v0.5.0 // indirect
68-
golang.org/x/tools v0.17.0 // indirect
70+
golang.org/x/tools v0.18.0 // indirect
6971
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7072
google.golang.org/appengine v1.6.7 // indirect
7173
google.golang.org/protobuf v1.34.1 // indirect
7274
gopkg.in/inf.v0 v0.9.1 // indirect
7375
gopkg.in/yaml.v2 v2.4.0 // indirect
7476
gopkg.in/yaml.v3 v3.0.1 // indirect
75-
k8s.io/apiextensions-apiserver v0.29.3 // indirect
76-
k8s.io/component-base v0.29.3 // indirect
77-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
77+
k8s.io/apiextensions-apiserver v0.30.1 // indirect
78+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
7879
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
7980
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
8081
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

go.sum

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
6868
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
6969
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
7070
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
71-
github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ=
72-
github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
71+
github.com/google/cel-go v0.17.8 h1:j9m730pMZt1Fc4oKhCLUHfjj6527LuhYcYw0Rl8gqto=
72+
github.com/google/cel-go v0.17.8/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
7373
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
7474
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
7575
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -211,8 +211,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
211211
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
212212
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
213213
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
214-
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
215-
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
214+
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
215+
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
216216
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
217217
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
218218
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -227,7 +227,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.
227227
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
228228
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
229229
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
230-
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
231230
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
232231
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
233232
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -242,30 +241,30 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
242241
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
243242
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
244243
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
245-
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
246-
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
247-
k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI=
248-
k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc=
249-
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
250-
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
251-
k8s.io/apiserver v0.29.3 h1:xR7ELlJ/BZSr2n4CnD3lfA4gzFivh0wwfNfz9L0WZcE=
252-
k8s.io/apiserver v0.29.3/go.mod h1:hrvXlwfRulbMbBgmWRQlFru2b/JySDpmzvQwwk4GUOs=
253-
k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
254-
k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=
244+
k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
245+
k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
246+
k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
247+
k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4=
248+
k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
249+
k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
250+
k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8=
251+
k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo=
252+
k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q=
253+
k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc=
255254
k8s.io/cluster-bootstrap v0.29.3 h1:DIMDZSN8gbFMy9CS2mAS2Iqq/fIUG783WN/1lqi5TF8=
256255
k8s.io/cluster-bootstrap v0.29.3/go.mod h1:aPAg1VtXx3uRrx5qU2jTzR7p1rf18zLXWS+pGhiqPto=
257-
k8s.io/component-base v0.29.3 h1:Oq9/nddUxlnrCuuR2K/jp6aflVvc0uDvxMzAWxnGzAo=
258-
k8s.io/component-base v0.29.3/go.mod h1:Yuj33XXjuOk2BAaHsIGHhCKZQAgYKhqIxIjIr2UXYio=
256+
k8s.io/component-base v0.30.1 h1:bvAtlPh1UrdaZL20D9+sWxsJljMi0QZ3Lmw+kmZAaxQ=
257+
k8s.io/component-base v0.30.1/go.mod h1:e/X9kDiOebwlI41AvBHuWdqFriSRrX50CdwA9TFaHLI=
259258
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
260259
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
261-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
262-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
260+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
261+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
263262
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
264263
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
265264
sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE=
266265
sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
267-
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
268-
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
266+
sigs.k8s.io/controller-runtime v0.18.3 h1:B5Wmmo8WMWK7izei+2LlXLVDGzMwAHBNLX68lwtlSR4=
267+
sigs.k8s.io/controller-runtime v0.18.3/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
269268
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
270269
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
271270
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

internal/controller/validatorconfig_controller.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (r *ValidatorConfigReconciler) Reconcile(ctx context.Context, req ctrl.Requ
107107

108108
err = removeFinalizer(ctx, r.Client, vc, CleanupFinalizer)
109109

110-
if emitErr := r.emitFinalizeCleanup(); emitErr != nil {
110+
if emitErr := r.emitFinalizeCleanup(ctx); emitErr != nil {
111111
r.Log.Error(emitErr, "Failed to emit FinalizeCleanup request")
112112
}
113113

@@ -394,7 +394,7 @@ func isConditionTrue(vc *v1alpha1.ValidatorConfig, chartName string, conditionTy
394394
return vc.Status.Conditions[idx], vc.Status.Conditions[idx].Status == corev1.ConditionTrue
395395
}
396396

397-
func (r *ValidatorConfigReconciler) emitFinalizeCleanup() error {
397+
func (r *ValidatorConfigReconciler) emitFinalizeCleanup(ctx context.Context) error {
398398
grpcEnabled := os.Getenv("CLEANUP_GRPC_SERVER_ENABLED")
399399
if grpcEnabled != "true" {
400400
r.Log.V(0).Info("Cleanup job gRPC server is not enabled")
@@ -417,10 +417,7 @@ func (r *ValidatorConfigReconciler) emitFinalizeCleanup() error {
417417
http.DefaultClient,
418418
url,
419419
)
420-
_, err = client.FinalizeCleanup(
421-
context.Background(),
422-
connect.NewRequest(&cleanv1.FinalizeCleanupRequest{}),
423-
)
420+
_, err = client.FinalizeCleanup(ctx, connect.NewRequest(&cleanv1.FinalizeCleanupRequest{}))
424421
if err != nil {
425422
return fmt.Errorf("FinalizeCleanup request to %s failed: %w", url, err)
426423
}

0 commit comments

Comments
 (0)