Skip to content

Commit a0ff10f

Browse files
danielstokesdanielstokes
authored
Merge branch 'main' into renovate/sigs.k8s.io-controller-runtime-0.x
2 parents 1d3aa0b + 9c02560 commit a0ff10f

File tree

8 files changed

+210
-58
lines changed

8 files changed

+210
-58
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM --platform=$BUILDPLATFORM golang:1.25.1-bookworm@sha256:c4bc0741e3c79c0e2d47ca2505a06f5f2a44682ada94e1dba251a3854e60c2bd AS builder
3+
FROM --platform=$BUILDPLATFORM golang:1.25.1-bookworm@sha256:c423747fbd96fd8f0b1102d947f51f9b266060217478e5f9bf86f145969562ee AS builder
44

55
WORKDIR /app
66
# Copy the Go Modules manifests

‎charts/k8s-agents-operator/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: v2
22
name: k8s-agents-operator
33
description: A Helm chart for the Kubernetes Agents Operator
44
type: application
5-
version: '0.31.0'
5+
version: '0.31.2'
66
dependencies:
77
- name: common-library
88
version: 1.3.3
99
repository: "https://helm-charts.newrelic.com"
10-
appVersion: '0.31.0'
10+
appVersion: '0.31.2'
1111
home: https://github.com/newrelic/k8s-agents-operator/blob/main/charts/k8s-agents-operator/README.md
1212
sources:
1313
- https://github.com/newrelic/k8s-agents-operator

‎charts/k8s-agents-operator/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# k8s-agents-operator
22

3-
![Version: 0.31.0](https://img.shields.io/badge/Version-0.31.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.31.0](https://img.shields.io/badge/AppVersion-0.31.0-informational?style=flat-square)
3+
![Version: 0.31.2](https://img.shields.io/badge/Version-0.31.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.31.2](https://img.shields.io/badge/AppVersion-0.31.2-informational?style=flat-square)
44

55
A Helm chart for the Kubernetes Agents Operator
66

‎charts/k8s-agents-operator/templates/instrumentation-crd.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ webhooks:
264264
- v1
265265
operations:
266266
- CREATE
267-
- UPDATE
268267
resources:
269268
- pods
270269
sideEffects: None

‎config/webhook/manifests.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ webhooks:
8080
- v1
8181
operations:
8282
- CREATE
83-
- UPDATE
8483
resources:
8584
- pods
8685
sideEffects: None

‎internal/webhook/podmutationhandler.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var (
2424
_ PodMutator = (*instrumentation.InstrumentationPodMutator)(nil)
2525
)
2626

27-
// +kubebuilder:webhook:path=/mutate-v1-pod,mutating=true,failurePolicy=ignore,groups="",resources=pods,verbs=create;update,versions=v1,name=mpod.kb.io,sideEffects=none,admissionReviewVersions=v1
27+
// +kubebuilder:webhook:path=/mutate-v1-pod,mutating=true,failurePolicy=ignore,groups="",resources=pods,verbs=create,versions=v1,name=mpod.kb.io,sideEffects=none,admissionReviewVersions=v1
2828
// +kubebuilder:rbac:groups="",resources=namespaces,verbs=list;watch
2929
// +kubebuilder:rbac:groups=newrelic.com,resources=instrumentations,verbs=get;list;watch
3030
// +kubebuilder:rbac:groups="apps",resources=replicasets,verbs=get;list;watch

‎tools/go.mod‎

Lines changed: 68 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ go 1.25.1
44

55
require (
66
github.com/arttor/helmify v0.4.18
7-
github.com/golangci/golangci-lint/v2 v2.4.0
8-
github.com/helm-unittest/helm-unittest v1.0.0
7+
github.com/golangci/golangci-lint/v2 v2.5.0
8+
github.com/helm-unittest/helm-unittest v1.0.1
99
github.com/helm/chart-testing/v3 v3.13.0
1010
github.com/norwoodj/helm-docs v1.14.2
11-
golang.org/x/tools v0.36.0
12-
helm.sh/helm/v3 v3.18.6
11+
golang.org/x/tools v0.37.0
12+
helm.sh/helm/v3 v3.19.0
1313
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250828001511-fc84a60eaaae
1414
sigs.k8s.io/controller-tools v0.19.0
1515
sigs.k8s.io/kustomize/kustomize/v5 v5.7.1
@@ -24,20 +24,22 @@ require (
2424
dev.gaijin.team/go/golib v0.6.0 // indirect
2525
github.com/4meepo/tagalign v1.4.3 // indirect
2626
github.com/Abirdcfly/dupword v0.1.6 // indirect
27+
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
2728
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
28-
github.com/Antonboom/errname v1.1.0 // indirect
29-
github.com/Antonboom/nilnil v1.1.0 // indirect
30-
github.com/Antonboom/testifylint v1.6.1 // indirect
29+
github.com/Antonboom/errname v1.1.1 // indirect
30+
github.com/Antonboom/nilnil v1.1.1 // indirect
31+
github.com/Antonboom/testifylint v1.6.4 // indirect
3132
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
3233
github.com/BurntSushi/toml v1.5.0 // indirect
33-
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
34+
github.com/Djarvur/go-err113 v0.1.1 // indirect
3435
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3536
github.com/Masterminds/goutils v1.1.1 // indirect
3637
github.com/Masterminds/semver v1.5.0 // indirect
37-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
38+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3839
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
3940
github.com/Masterminds/squirrel v1.5.4 // indirect
4041
github.com/Masterminds/vcs v1.13.3 // indirect
42+
github.com/MirrexOne/unqueryvet v1.2.1 // indirect
4143
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
4244
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
4345
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
@@ -55,7 +57,7 @@ require (
5557
github.com/blang/semver/v4 v4.0.0 // indirect
5658
github.com/blizzy78/varnamelen v0.8.0 // indirect
5759
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
58-
github.com/bombsimon/wsl/v5 v5.1.1 // indirect
60+
github.com/bombsimon/wsl/v5 v5.2.0 // indirect
5961
github.com/breml/bidichk v0.3.3 // indirect
6062
github.com/breml/errchkjson v0.4.1 // indirect
6163
github.com/butuzov/ireturn v0.4.0 // indirect
@@ -72,7 +74,7 @@ require (
7274
github.com/charmbracelet/x/term v0.2.1 // indirect
7375
github.com/ckaznocha/intrange v0.3.1 // indirect
7476
github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 // indirect
75-
github.com/containerd/containerd v1.7.27 // indirect
77+
github.com/containerd/containerd v1.7.28 // indirect
7678
github.com/containerd/errdefs v0.3.0 // indirect
7779
github.com/containerd/log v0.1.0 // indirect
7880
github.com/containerd/platforms v0.2.1 // indirect
@@ -84,8 +86,8 @@ require (
8486
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8587
github.com/denis-tingaikin/go-header v0.5.0 // indirect
8688
github.com/dlclark/regexp2 v1.11.5 // indirect
87-
github.com/dprotaso/go-yit v0.0.0-20240618133044-5a0af90af097 // indirect
88-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
89+
github.com/dprotaso/go-yit v0.0.0-20250513224043-18a80f8f6df4 // indirect
90+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
8991
github.com/ettle/strcase v0.2.0 // indirect
9092
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
9193
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
@@ -95,15 +97,26 @@ require (
9597
github.com/fsnotify/fsnotify v1.9.0 // indirect
9698
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
9799
github.com/fzipp/gocyclo v0.6.0 // indirect
98-
github.com/ghostiam/protogetter v0.3.15 // indirect
100+
github.com/ghostiam/protogetter v0.3.16 // indirect
99101
github.com/go-critic/go-critic v0.13.0 // indirect
100102
github.com/go-errors/errors v1.4.2 // indirect
101103
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
102104
github.com/go-logr/logr v1.4.3 // indirect
103105
github.com/go-logr/zapr v1.3.0 // indirect
104-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
105-
github.com/go-openapi/jsonreference v0.21.0 // indirect
106-
github.com/go-openapi/swag v0.23.1 // indirect
106+
github.com/go-openapi/jsonpointer v0.22.0 // indirect
107+
github.com/go-openapi/jsonreference v0.21.1 // indirect
108+
github.com/go-openapi/swag v0.24.1 // indirect
109+
github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
110+
github.com/go-openapi/swag/conv v0.24.0 // indirect
111+
github.com/go-openapi/swag/fileutils v0.24.0 // indirect
112+
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
113+
github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
114+
github.com/go-openapi/swag/loading v0.24.0 // indirect
115+
github.com/go-openapi/swag/mangling v0.24.0 // indirect
116+
github.com/go-openapi/swag/netutils v0.24.0 // indirect
117+
github.com/go-openapi/swag/stringutils v0.24.0 // indirect
118+
github.com/go-openapi/swag/typeutils v0.24.0 // indirect
119+
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
107120
github.com/go-toolsmith/astcast v1.1.0 // indirect
108121
github.com/go-toolsmith/astcopy v1.1.0 // indirect
109122
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -115,13 +128,16 @@ require (
115128
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
116129
github.com/gobuffalo/flect v1.0.3 // indirect
117130
github.com/gobwas/glob v0.2.3 // indirect
131+
github.com/godoc-lint/godoc-lint v0.10.0 // indirect
118132
github.com/gofrs/flock v0.12.1 // indirect
119133
github.com/gogo/protobuf v1.3.2 // indirect
134+
github.com/golangci/asciicheck v0.5.0 // indirect
120135
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
121-
github.com/golangci/go-printf-func-name v0.1.0 // indirect
136+
github.com/golangci/go-printf-func-name v0.1.1 // indirect
122137
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
123138
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
124139
github.com/golangci/misspell v0.7.0 // indirect
140+
github.com/golangci/nilerr v0.0.0-20250918000102-015671e622fe // indirect
125141
github.com/golangci/plugin-module-register v0.1.2 // indirect
126142
github.com/golangci/revgrep v0.8.0 // indirect
127143
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
@@ -130,7 +146,7 @@ require (
130146
github.com/google/gnostic-models v0.7.0 // indirect
131147
github.com/google/go-cmp v0.7.0 // indirect
132148
github.com/google/uuid v1.6.0 // indirect
133-
github.com/gordonklaus/ineffassign v0.1.0 // indirect
149+
github.com/gordonklaus/ineffassign v0.2.0 // indirect
134150
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
135151
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
136152
github.com/gostaticanalysis/comment v1.5.0 // indirect
@@ -160,23 +176,23 @@ require (
160176
github.com/kisielk/errcheck v1.9.0 // indirect
161177
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
162178
github.com/klauspost/compress v1.18.0 // indirect
163-
github.com/kulti/thelper v0.6.3 // indirect
179+
github.com/kulti/thelper v0.7.1 // indirect
164180
github.com/kunwardeep/paralleltest v1.0.14 // indirect
165181
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
166182
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
167183
github.com/lasiar/canonicalheader v1.1.2 // indirect
168184
github.com/ldez/exptostd v0.4.4 // indirect
169185
github.com/ldez/gomoddirectives v0.7.0 // indirect
170-
github.com/ldez/grignotin v0.10.0 // indirect
171-
github.com/ldez/tagliatelle v0.7.1 // indirect
186+
github.com/ldez/grignotin v0.10.1 // indirect
187+
github.com/ldez/tagliatelle v0.7.2 // indirect
172188
github.com/ldez/usetesting v0.5.0 // indirect
173189
github.com/leonklingele/grouper v1.1.2 // indirect
174190
github.com/lib/pq v1.10.9 // indirect
175191
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
176192
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
177193
github.com/macabu/inamedparam v0.2.0 // indirect
178194
github.com/mailru/easyjson v0.9.0 // indirect
179-
github.com/manuelarte/embeddedstructfieldcheck v0.3.0 // indirect
195+
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
180196
github.com/manuelarte/funcorder v0.5.0 // indirect
181197
github.com/maratori/testableexamples v1.0.0 // indirect
182198
github.com/maratori/testpackage v1.1.1 // indirect
@@ -185,7 +201,7 @@ require (
185201
github.com/mattn/go-isatty v0.0.20 // indirect
186202
github.com/mattn/go-runewidth v0.0.16 // indirect
187203
github.com/mattn/go-shellwords v1.0.12 // indirect
188-
github.com/mgechev/revive v1.11.0 // indirect
204+
github.com/mgechev/revive v1.12.0 // indirect
189205
github.com/mitchellh/copystructure v1.2.0 // indirect
190206
github.com/mitchellh/go-homedir v1.1.0 // indirect
191207
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -203,7 +219,7 @@ require (
203219
github.com/nakabonne/nestif v0.3.1 // indirect
204220
github.com/nishanths/exhaustive v0.12.0 // indirect
205221
github.com/nishanths/predeclared v0.2.2 // indirect
206-
github.com/nunnatsa/ginkgolinter v0.20.0 // indirect
222+
github.com/nunnatsa/ginkgolinter v0.21.0 // indirect
207223
github.com/opencontainers/go-digest v1.0.0 // indirect
208224
github.com/opencontainers/image-spec v1.1.1 // indirect
209225
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
@@ -232,7 +248,7 @@ require (
232248
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
233249
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
234250
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
235-
github.com/securego/gosec/v2 v2.22.7 // indirect
251+
github.com/securego/gosec/v2 v2.22.8 // indirect
236252
github.com/sergi/go-diff v1.2.0 // indirect
237253
github.com/shopspring/decimal v1.4.0 // indirect
238254
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -241,17 +257,17 @@ require (
241257
github.com/sourcegraph/conc v0.3.0 // indirect
242258
github.com/sourcegraph/go-diff v0.7.0 // indirect
243259
github.com/spf13/afero v1.14.0 // indirect
244-
github.com/spf13/cast v1.8.0 // indirect
245-
github.com/spf13/cobra v1.9.1 // indirect
246-
github.com/spf13/pflag v1.0.7 // indirect
260+
github.com/spf13/cast v1.9.2 // indirect
261+
github.com/spf13/cobra v1.10.1 // indirect
262+
github.com/spf13/pflag v1.0.10 // indirect
247263
github.com/spf13/viper v1.20.1 // indirect
248264
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
249265
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
250266
github.com/stretchr/objx v0.5.2 // indirect
251-
github.com/stretchr/testify v1.10.0 // indirect
267+
github.com/stretchr/testify v1.11.1 // indirect
252268
github.com/subosito/gotenv v1.6.0 // indirect
253269
github.com/tdakkota/asciicheck v0.4.1 // indirect
254-
github.com/tetafro/godot v1.5.1 // indirect
270+
github.com/tetafro/godot v1.5.4 // indirect
255271
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
256272
github.com/timonwong/loggercheck v0.11.0 // indirect
257273
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
@@ -270,31 +286,32 @@ require (
270286
github.com/yeya24/promlinter v0.3.0 // indirect
271287
github.com/ykadowak/zerologlint v0.1.5 // indirect
272288
gitlab.com/bosi/decorder v0.4.2 // indirect
273-
go-simpler.org/musttag v0.13.1 // indirect
289+
go-simpler.org/musttag v0.14.0 // indirect
274290
go-simpler.org/sloglint v0.11.1 // indirect
275291
go.augendre.info/arangolint v0.2.0 // indirect
276-
go.augendre.info/fatcontext v0.8.0 // indirect
292+
go.augendre.info/fatcontext v0.8.1 // indirect
277293
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
278294
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
279295
go.uber.org/automaxprocs v1.6.0 // indirect
280296
go.uber.org/multierr v1.11.0 // indirect
281297
go.uber.org/zap v1.27.0 // indirect
282298
go.yaml.in/yaml/v2 v2.4.2 // indirect
283299
go.yaml.in/yaml/v3 v3.0.4 // indirect
284-
golang.org/x/crypto v0.41.0 // indirect
285-
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
286-
golang.org/x/mod v0.27.0 // indirect
287-
golang.org/x/net v0.43.0 // indirect
300+
golang.org/x/crypto v0.42.0 // indirect
301+
golang.org/x/exp/typeparams v0.0.0-20250911091902-df9299821621 // indirect
302+
golang.org/x/mod v0.28.0 // indirect
303+
golang.org/x/net v0.44.0 // indirect
288304
golang.org/x/oauth2 v0.30.0 // indirect
289-
golang.org/x/sync v0.16.0 // indirect
290-
golang.org/x/sys v0.35.0 // indirect
291-
golang.org/x/term v0.34.0 // indirect
292-
golang.org/x/text v0.28.0 // indirect
305+
golang.org/x/sync v0.17.0 // indirect
306+
golang.org/x/sys v0.36.0 // indirect
307+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
308+
golang.org/x/term v0.35.0 // indirect
309+
golang.org/x/text v0.29.0 // indirect
293310
golang.org/x/time v0.12.0 // indirect
294-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
295-
google.golang.org/grpc v1.73.0 // indirect
296-
google.golang.org/protobuf v1.36.7 // indirect
297-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
311+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
312+
google.golang.org/grpc v1.74.2 // indirect
313+
google.golang.org/protobuf v1.36.8 // indirect
314+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
298315
gopkg.in/inf.v0 v0.9.1 // indirect
299316
gopkg.in/yaml.v2 v2.4.0 // indirect
300317
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -303,19 +320,19 @@ require (
303320
k8s.io/apiextensions-apiserver v0.34.0 // indirect
304321
k8s.io/apimachinery v0.34.0 // indirect
305322
k8s.io/apiserver v0.34.0 // indirect
306-
k8s.io/cli-runtime v0.33.3 // indirect
323+
k8s.io/cli-runtime v0.34.0 // indirect
307324
k8s.io/client-go v0.34.0 // indirect
308325
k8s.io/code-generator v0.34.0 // indirect
309326
k8s.io/component-base v0.34.0 // indirect
310327
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
311328
k8s.io/klog/v2 v2.130.1 // indirect
312-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
313-
k8s.io/kubectl v0.33.3 // indirect
314-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
315-
mvdan.cc/gofumpt v0.8.0 // indirect
329+
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
330+
k8s.io/kubectl v0.34.0 // indirect
331+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
332+
mvdan.cc/gofumpt v0.9.1 // indirect
316333
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
317334
oras.land/oras-go/v2 v2.6.0 // indirect
318-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
335+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
319336
sigs.k8s.io/kustomize/api v0.20.1 // indirect
320337
sigs.k8s.io/kustomize/cmd/config v0.20.1 // indirect
321338
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect

0 commit comments

Comments
 (0)