Skip to content

Commit 7db0e58

Browse files
renovate[bot]aalexand
andauthored
fix(deps): update kubernetes packages to v0.32.0 (#276)
* fix(deps): update kubernetes packages to v0.32.0 * Bump golangci version * Bump golang-version to 1.23.4 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: aalexand <[email protected]>
1 parent bfae212 commit 7db0e58

File tree

7 files changed

+62
-34
lines changed

7 files changed

+62
-34
lines changed

.github/env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang-version=1.22.4
1+
golang-version=1.23.4

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ lint-fix: golangci-lint
160160
$(GOLANGCI_LINT) run --fix
161161

162162
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
163-
GOLANGCI_LINT_VERSION = "v1.54.2"
163+
GOLANGCI_LINT_VERSION = "v1.62.2"
164164
golangci-lint:
165165
@[ -f $(GOLANGCI_LINT) ] || GOBIN=$(shell pwd)/bin go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION);
166166

go.mod

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/adobe/cluster-registry
22

3-
go 1.22.4
3+
go 1.23.0
4+
5+
toolchain go1.23.4
46

57
require (
68
dario.cat/mergo v1.0.1
@@ -32,17 +34,17 @@ require (
3234
gopkg.in/go-playground/validator.v9 v9.31.0
3335
gopkg.in/yaml.v2 v2.4.0
3436
gopkg.in/yaml.v3 v3.0.1
35-
k8s.io/api v0.31.2
36-
k8s.io/apimachinery v0.31.2
37-
k8s.io/client-go v0.31.2
38-
k8s.io/component-base v0.31.2
37+
k8s.io/api v0.32.0
38+
k8s.io/apimachinery v0.32.0
39+
k8s.io/client-go v0.32.0
40+
k8s.io/component-base v0.32.0
3941
k8s.io/utils v0.0.0-20241210054802-24370beab758
4042
sigs.k8s.io/controller-runtime v0.19.3
4143
sigs.k8s.io/yaml v1.4.0
4244
)
4345

4446
require (
45-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
47+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4648
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
4749
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
4850
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
@@ -76,10 +78,10 @@ require (
7678
github.com/go-logr/stdr v1.2.2 // indirect
7779
github.com/go-logr/zapr v1.3.0 // indirect
7880
github.com/go-ole/go-ole v1.2.6 // indirect
79-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
81+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8082
github.com/go-openapi/jsonreference v0.20.2 // indirect
8183
github.com/go-openapi/spec v0.20.4 // indirect
82-
github.com/go-openapi/swag v0.22.4 // indirect
84+
github.com/go-openapi/swag v0.23.0 // indirect
8385
github.com/go-playground/locales v0.14.1 // indirect
8486
github.com/go-playground/universal-translator v0.18.1 // indirect
8587
github.com/gogo/protobuf v1.3.2 // indirect
@@ -114,7 +116,7 @@ require (
114116
github.com/morikuni/aec v1.0.0 // indirect
115117
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
116118
github.com/nxadm/tail v1.4.8 // indirect
117-
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
119+
github.com/onsi/ginkgo/v2 v2.21.0 // indirect
118120
github.com/opencontainers/go-digest v1.0.0 // indirect
119121
github.com/opencontainers/image-spec v1.1.0 // indirect
120122
github.com/pkg/errors v0.9.1 // indirect
@@ -139,7 +141,7 @@ require (
139141
go.opentelemetry.io/otel/metric v1.29.0 // indirect
140142
go.opentelemetry.io/otel/trace v1.29.0 // indirect
141143
go.uber.org/multierr v1.11.0 // indirect
142-
go.uber.org/zap v1.26.0 // indirect
144+
go.uber.org/zap v1.27.0 // indirect
143145
golang.org/x/crypto v0.31.0 // indirect
144146
golang.org/x/oauth2 v0.23.0 // indirect
145147
golang.org/x/sync v0.10.0 // indirect
@@ -149,7 +151,7 @@ require (
149151
golang.org/x/time v0.8.0 // indirect
150152
golang.org/x/tools v0.28.0 // indirect
151153
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
152-
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
154+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
153155
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
154156
google.golang.org/grpc v1.66.2 // indirect
155157
google.golang.org/protobuf v1.35.1 // indirect
@@ -159,7 +161,7 @@ require (
159161
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
160162
k8s.io/apiextensions-apiserver v0.31.0 // indirect
161163
k8s.io/klog/v2 v2.130.1 // indirect
162-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
163-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
164-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
164+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
165+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
166+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
165167
)

go.sum

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
44
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
55
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
66
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
7+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
8+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
79
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
810
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
911
github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM=
@@ -115,6 +117,8 @@ github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34
115117
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
116118
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
117119
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
120+
github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
121+
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
118122
github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
119123
github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
120124
github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
@@ -125,6 +129,8 @@ github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/
125129
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
126130
github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
127131
github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
132+
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
133+
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
128134
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
129135
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
130136
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
@@ -264,6 +270,7 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
264270
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
265271
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
266272
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
273+
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
267274
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
268275
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
269276
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
@@ -374,6 +381,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
374381
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
375382
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
376383
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
384+
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
385+
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
377386
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
378387
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
379388
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -527,6 +536,7 @@ gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw
527536
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
528537
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f h1:b1Ln/PG8orm0SsBbHZWke8dDp2lrCD4jSmfglFpTZbk=
529538
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys=
539+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo=
530540
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
531541
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
532542
google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
@@ -575,6 +585,8 @@ k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
575585
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
576586
k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
577587
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
588+
k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
589+
k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
578590
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
579591
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
580592
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
@@ -583,22 +595,30 @@ k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
583595
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
584596
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
585597
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
598+
k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
599+
k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
586600
k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
587601
k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
588602
k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0=
589603
k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg=
590604
k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
591605
k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
606+
k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=
607+
k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8=
592608
k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs=
593609
k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo=
594610
k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8=
595611
k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w=
596612
k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA=
597613
k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ=
614+
k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU=
615+
k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM=
598616
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
599617
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
600618
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
601619
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
620+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
621+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
602622
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA=
603623
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
604624
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
@@ -613,7 +633,11 @@ sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8b
613633
sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
614634
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
615635
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
636+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
637+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
616638
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
617639
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
640+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
641+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
618642
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
619643
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

local/sqs/sqs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func main() {
7575

7676
id, err := uuid.NewUUID()
7777
if err != nil {
78-
log.Panicf(err.Error())
78+
log.Panic(err.Error())
7979
}
8080

8181
for _, cluster := range clusters {

pkg/client/controllers/servicemetadatawatcher_controller.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ func (r *ServiceMetadataWatcherReconciler) Reconcile(ctx context.Context, req ct
6262

6363
log := r.Log.WithValues("name", req.NamespacedName)
6464
log.Info("start")
65-
defer log.Info("end", "duration", time.Since(start))
65+
defer func() {
66+
log.Info("end", "duration", time.Since(start))
67+
}()
6668

6769
instance := new(registryv1alpha1.ServiceMetadataWatcher)
6870
if err := r.Get(ctx, req.NamespacedName, instance); err != nil {

pkg/database/database.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (d *db) Status() error {
124124
d.metrics.RecordErrorCnt(egressTarget)
125125
msg := fmt.Sprintf("Connectivity check using DescribeTable failed. Error: '%v'", err.Error())
126126
log.Errorf(msg)
127-
return fmt.Errorf(msg)
127+
return fmt.Errorf("%s", msg)
128128
}
129129

130130
return nil
@@ -151,7 +151,7 @@ func (d *db) GetCluster(name string) (*registryv1.Cluster, error) {
151151
if err != nil {
152152
msg := fmt.Sprintf("Cannot get cluster '%s' from the database. Error: '%v'", name, err.Error())
153153
log.Errorf(msg)
154-
return nil, fmt.Errorf(msg)
154+
return nil, fmt.Errorf("%s", msg)
155155
}
156156

157157
if resp.Item == nil {
@@ -164,7 +164,7 @@ func (d *db) GetCluster(name string) (*registryv1.Cluster, error) {
164164
if err != nil {
165165
msg := fmt.Sprintf("Cannot unmarshal cluster '%s': '%v'", name, err.Error())
166166
log.Errorf(msg)
167-
return nil, fmt.Errorf(msg)
167+
return nil, fmt.Errorf("%s", msg)
168168
}
169169

170170
return clusterDb.Cluster, err
@@ -199,7 +199,7 @@ func (d *db) ListClusters(offset int, limit int, region string, environment stri
199199
if err != nil {
200200
msg := fmt.Sprintf("Error converting lastUpdated parameter to RFC3339: '%v'.", err)
201201
log.Errorf(msg)
202-
return nil, 0, false, fmt.Errorf(msg)
202+
return nil, 0, false, fmt.Errorf("%s", msg)
203203
}
204204
filter = filter.And(expression.Name("lastUpdatedUnix").GreaterThanEqual(expression.Value(t.Unix())))
205205
}
@@ -209,8 +209,8 @@ func (d *db) ListClusters(offset int, limit int, region string, environment stri
209209

210210
if err != nil {
211211
msg := fmt.Sprintf("Building dynamodb query expersion failed: '%v'.", err)
212-
log.Errorf(msg)
213-
return nil, 0, false, fmt.Errorf(msg)
212+
log.Errorf("%s", msg)
213+
return nil, 0, false, fmt.Errorf("%s", msg)
214214
}
215215

216216
queryInput = &dynamodb.QueryInput{
@@ -233,7 +233,7 @@ func (d *db) ListClusters(offset int, limit int, region string, environment stri
233233
if err != nil {
234234
msg := fmt.Sprintf("DynamonDB API query call failed: '%v'.", err.Error())
235235
log.Errorf(msg)
236-
return nil, 0, false, fmt.Errorf(msg)
236+
return nil, 0, false, fmt.Errorf("%s", msg)
237237
}
238238

239239
for _, i := range result.Items {
@@ -243,7 +243,7 @@ func (d *db) ListClusters(offset int, limit int, region string, environment stri
243243
if err != nil {
244244
msg := fmt.Sprintf("Error when trying to unmarshal cluster: '%v'.", err.Error())
245245
log.Errorf(msg)
246-
return nil, 0, false, fmt.Errorf(msg)
246+
return nil, 0, false, fmt.Errorf("%s", msg)
247247
}
248248
clusters = append(clusters, *item.Cluster)
249249
}
@@ -283,7 +283,7 @@ func (d *db) ListClustersWithFilter(offset int, limit int, filter *DynamoDBFilte
283283
if err != nil {
284284
msg := fmt.Sprintf("Building dynamodb scan expersion failed: '%v'.", err)
285285
log.Errorf(msg)
286-
return nil, 0, false, fmt.Errorf(msg)
286+
return nil, 0, false, fmt.Errorf("%s", msg)
287287
}
288288

289289
scanInput = &dynamodb.ScanInput{
@@ -305,7 +305,7 @@ func (d *db) ListClustersWithFilter(offset int, limit int, filter *DynamoDBFilte
305305
if err != nil {
306306
msg := fmt.Sprintf("DynamoDB API scan call failed: '%v'.", err.Error())
307307
log.Errorf(msg)
308-
return nil, 0, false, fmt.Errorf(msg)
308+
return nil, 0, false, fmt.Errorf("%s", msg)
309309
}
310310

311311
for _, i := range result.Items {
@@ -315,7 +315,7 @@ func (d *db) ListClustersWithFilter(offset int, limit int, filter *DynamoDBFilte
315315
if err != nil {
316316
msg := fmt.Sprintf("Error when trying to unmarshal cluster: '%v'.", err.Error())
317317
log.Errorf(msg)
318-
return nil, 0, false, fmt.Errorf(msg)
318+
return nil, 0, false, fmt.Errorf("%s", msg)
319319
}
320320
clusters = append(clusters, *item.Cluster)
321321
}
@@ -347,7 +347,7 @@ func (d *db) PutCluster(cluster *registryv1.Cluster) error {
347347
if err != nil {
348348
msg := fmt.Sprintf("Error converting lastUpdated parameter to RFC3339 for cluster %s: '%v'.", cluster.Spec.Name, err)
349349
log.Errorf(msg)
350-
return fmt.Errorf(msg)
350+
return fmt.Errorf("%s", msg)
351351
}
352352

353353
existingCluster, _ := d.GetCluster(cluster.Spec.Name)
@@ -369,7 +369,7 @@ func (d *db) PutCluster(cluster *registryv1.Cluster) error {
369369
if err != nil {
370370
msg := fmt.Sprintf("Cannot marshal cluster '%s' into AttributeValue map.", cluster.Spec.Name)
371371
log.Errorf(msg)
372-
return fmt.Errorf(msg)
372+
return fmt.Errorf("%s", msg)
373373
}
374374

375375
params := &dynamodb.PutItemInput{
@@ -387,7 +387,7 @@ func (d *db) PutCluster(cluster *registryv1.Cluster) error {
387387
if err != nil {
388388
msg := fmt.Sprintf("Cluster '%s' cannot be updated or created in the database. Error: '%v'", cluster.Spec.Name, err.Error())
389389
log.Errorf(msg)
390-
return fmt.Errorf(msg)
390+
return fmt.Errorf("%s", msg)
391391
}
392392

393393
log.Infof("Cluster '%s' updated.", cluster.Spec.Name)
@@ -416,7 +416,7 @@ func (d *db) DeleteCluster(name string) error {
416416
if err != nil {
417417
msg := fmt.Sprintf("Error while deleting cluster %s from db: %v", name, err.Error())
418418
log.Errorf(msg)
419-
return fmt.Errorf(msg)
419+
return fmt.Errorf("%s", msg)
420420
}
421421

422422
log.Infof("Cluster %s deleted.", name)
@@ -462,7 +462,7 @@ func (d *db) ListClustersWithServiceAndFilter(serviceId string, offset int, limi
462462
if err != nil {
463463
msg := fmt.Sprintf("Failed to list clusters with filter: '%v'.", err)
464464
log.Errorf(msg)
465-
return nil, 0, false, fmt.Errorf(msg)
465+
return nil, 0, false, fmt.Errorf("%s", msg)
466466
}
467467

468468
var clustersWithService []registryv1.Cluster

0 commit comments

Comments
 (0)