Skip to content

Commit 8ec11b7

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #519 from kubernetes-sigs/dependabot/go_modules/k8s.io/client-go-0.35.1
chore(deps): bump k8s.io/client-go from 0.35.0 to 0.35.1
2 parents 18e7a4b + 859f184 commit 8ec11b7

File tree

11 files changed

+32
-24
lines changed

11 files changed

+32
-24
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ repos:
4242
pass_filenames: false
4343
stages: [pre-push]
4444
- repo: https://github.com/golangci/golangci-lint
45-
rev: v2.6.2
45+
rev: v2.10.1
4646
hooks:
4747
- id: golangci-lint
4848
entry: golangci-lint run

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ CGO_ENABLED = 0
2727
# Test settings
2828
GTEST_ARGS = -v -race -timeout=30m
2929

30-
CONTROLLER_GEN = ~/.local/share/go/bin/controller-gen
30+
CONTROLLER_GEN = go run sigs.k8s.io/controller-tools/cmd/controller-gen
3131

3232
.PHONY: all
3333
all: build

‎charts/crds/karpenter-ibm.sh_ibmnodeclasses.yaml‎

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

‎charts/crds/karpenter.sh_nodeclaims.yaml‎

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

‎charts/crds/karpenter.sh_nodeoverlays.yaml‎

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

‎charts/crds/karpenter.sh_nodepools.yaml‎

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

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ require (
2222
go.uber.org/multierr v1.11.0
2323
go.uber.org/zap v1.27.1
2424
golang.org/x/sync v0.19.0
25-
k8s.io/api v0.35.0
25+
k8s.io/api v0.35.1
2626
k8s.io/apimachinery v0.36.0-alpha.0
27-
k8s.io/client-go v0.35.0
27+
k8s.io/client-go v0.35.1
2828
k8s.io/klog/v2 v2.130.1
2929
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2
30-
sigs.k8s.io/controller-runtime v0.22.4
31-
sigs.k8s.io/controller-tools v0.19.0
30+
sigs.k8s.io/controller-runtime v0.23.1
31+
sigs.k8s.io/controller-tools v0.20.1
3232
sigs.k8s.io/karpenter v1.9.0
3333
)
3434

@@ -119,7 +119,7 @@ require (
119119
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
120120
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
121121
sigs.k8s.io/randfill v1.0.0 // indirect
122-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
122+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
123123
sigs.k8s.io/yaml v1.6.0 // indirect
124124
)
125125

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -338,16 +338,16 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
338338
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
339339
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
340340
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
341-
k8s.io/api v0.35.0 h1:iBAU5LTyBI9vw3L5glmat1njFK34srdLmktWwLTprlY=
342-
k8s.io/api v0.35.0/go.mod h1:AQ0SNTzm4ZAczM03QH42c7l3bih1TbAXYo0DkF8ktnA=
341+
k8s.io/api v0.35.1 h1:0PO/1FhlK/EQNVK5+txc4FuhQibV25VLSdLMmGpDE/Q=
342+
k8s.io/api v0.35.1/go.mod h1:28uR9xlXWml9eT0uaGo6y71xK86JBELShLy4wR1XtxM=
343343
k8s.io/apiextensions-apiserver v0.35.0 h1:3xHk2rTOdWXXJM+RDQZJvdx0yEOgC0FgQ1PlJatA5T4=
344344
k8s.io/apiextensions-apiserver v0.35.0/go.mod h1:E1Ahk9SADaLQ4qtzYFkwUqusXTcaV2uw3l14aqpL2LU=
345345
k8s.io/apimachinery v0.36.0-alpha.0 h1:/i3pMBfesiJMeXuFZYgrbhBRKgGlrnsgFxyk2YnuezU=
346346
k8s.io/apimachinery v0.36.0-alpha.0/go.mod h1:dR9KPaf5L0t2p9jZg/wCGB4b3ma2sXZ2zdNqILs+Sak=
347347
k8s.io/apiserver v0.35.0 h1:CUGo5o+7hW9GcAEF3x3usT3fX4f9r8xmgQeCBDaOgX4=
348348
k8s.io/apiserver v0.35.0/go.mod h1:QUy1U4+PrzbJaM3XGu2tQ7U9A4udRRo5cyxkFX0GEds=
349-
k8s.io/client-go v0.35.0 h1:IAW0ifFbfQQwQmga0UdoH0yvdqrbwMdq9vIFEhRpxBE=
350-
k8s.io/client-go v0.35.0/go.mod h1:q2E5AAyqcbeLGPdoRB+Nxe3KYTfPce1Dnu1myQdqz9o=
349+
k8s.io/client-go v0.35.1 h1:+eSfZHwuo/I19PaSxqumjqZ9l5XiTEKbIaJ+j1wLcLM=
350+
k8s.io/client-go v0.35.1/go.mod h1:1p1KxDt3a0ruRfc/pG4qT/3oHmUj1AhSHEcxNSGg+OA=
351351
k8s.io/cloud-provider v0.35.0 h1:syiBCQbKh2gho/S1BkIl006Dc44pV8eAtGZmv5NMe7M=
352352
k8s.io/cloud-provider v0.35.0/go.mod h1:7grN+/Nt5Hf7tnSGPT3aErt4K7aQpygyCrGpbrQbzNc=
353353
k8s.io/code-generator v0.35.0 h1:TvrtfKYZTm9oDF2z+veFKSCcgZE3Igv0svY+ehCmjHQ=
@@ -368,17 +368,17 @@ k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2 h1:OfgiEo21hGiwx1oJUU5MpEaeOEg6c
368368
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
369369
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
370370
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
371-
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
372-
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
373-
sigs.k8s.io/controller-tools v0.19.0 h1:OU7jrPPiZusryu6YK0jYSjPqg8Vhf8cAzluP9XGI5uk=
374-
sigs.k8s.io/controller-tools v0.19.0/go.mod h1:y5HY/iNDFkmFla2CfQoVb2AQXMsBk4ad84iR1PLANB0=
371+
sigs.k8s.io/controller-runtime v0.23.1 h1:TjJSM80Nf43Mg21+RCy3J70aj/W6KyvDtOlpKf+PupE=
372+
sigs.k8s.io/controller-runtime v0.23.1/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
373+
sigs.k8s.io/controller-tools v0.20.1 h1:gkfMt9YodI0K85oT8rVi80NTXO/kDmabKR5Ajn5GYxs=
374+
sigs.k8s.io/controller-tools v0.20.1/go.mod h1:b4qPmjGU3iZwqn34alUU5tILhNa9+VXK+J3QV0fT/uU=
375375
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
376376
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
377377
sigs.k8s.io/karpenter v1.9.0 h1:95p6+9AaZ/eYD3hLPyvBDBquC3v8m09T2u/pB/3Qrqs=
378378
sigs.k8s.io/karpenter v1.9.0/go.mod h1:qQOhEoIl4nqo6vkGhEw95tzcXou5Osjn/mvLzIVFw5A=
379379
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
380380
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
381-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 h1:JrhdFMqOd/+3ByqlP2I45kTOZmTRLBUm5pvRjeheg7E=
382-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
381+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 h1:2WOzJpHUBVrrkDjU4KBT8n5LDcj824eX0I5UKcgeRUs=
382+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
383383
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
384384
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

‎pkg/apis/v1alpha1/ibmnodeclass_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ var (
3636

3737
// SetupWebhookWithManager sets up the webhook with the manager
3838
func (nc *IBMNodeClass) SetupWebhookWithManager(mgr ctrl.Manager) error {
39-
return ctrl.NewWebhookManagedBy(mgr).
40-
For(nc).
39+
return ctrl.NewWebhookManagedBy(mgr, nc).
40+
WithCustomValidator(nc).
4141
Complete()
4242
}
4343

‎pkg/controllers/interruption/controller_test.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,10 @@ func (m *mockSubResourceWriter) Patch(ctx context.Context, obj client.Object, pa
630630
return assert.AnError
631631
}
632632

633+
func (m *mockSubResourceWriter) Apply(ctx context.Context, obj runtime.ApplyConfiguration, opts ...client.SubResourceApplyOption) error {
634+
return assert.AnError
635+
}
636+
633637
// mockSubResourceClient implements client.SubResourceClient
634638
type mockSubResourceClient struct{}
635639

@@ -649,6 +653,10 @@ func (m *mockSubResourceClient) Patch(ctx context.Context, obj client.Object, pa
649653
return assert.AnError
650654
}
651655

656+
func (m *mockSubResourceClient) Apply(ctx context.Context, obj runtime.ApplyConfiguration, opts ...client.SubResourceApplyOption) error {
657+
return assert.AnError
658+
}
659+
652660
func (m *mockErrorClient) Scheme() *runtime.Scheme {
653661
return runtime.NewScheme()
654662
}

0 commit comments

Comments
 (0)