Skip to content

chore: bump sigs.k8s.io/controller-runtime from 0.22.4 to 0.23.0 #2008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore: bump sigs.k8s.io/controller-runtime from 0.22.4 to 0.23.0 #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e967cf
chore: bump sigs.k8s.io/controller-runtime from 0.22.4 to 0.23.0
dependabot[bot] Jan 19, 2026
c271034
chore: additional dependency updates to support sigs.k8s.io/controlle…
Camila-B Jan 22, 2026
463e69b
test: Update syncertest/fake
Camila-B Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GO_DIR := $(OUTPUT_DIR)/go

# Base image used for all golang containers
# Uses trusted google-built golang image
GOLANG_IMAGE_VERSION := 1.24.11
GOLANG_IMAGE_VERSION := 1.25.0
GOLANG_IMAGE := google-go.pkg.dev/golang:$(GOLANG_IMAGE_VERSION)
# Base image used for debian containers
# When updating you can use this command:
Expand Down
1 change: 1 addition & 0 deletions Makefile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ BUILD_IMAGE_TARGETS := $(patsubst %,__build-image-%,$(IMAGES))
$(BUILD_IMAGE_TARGETS): "$(HELM)" "$(KUSTOMIZE)"
@echo "+++ Building the $(subst __build-image-,,$@) image: $(call gen_image_tag,$(subst __build-image-,,$@))"
@docker buildx build $(DOCKER_BUILD_QUIET) \
--load \
--target $(subst __build-image-,,$@) \
-t $(call gen_image_tag,$(subst __build-image-,,$@)) \
-f build/all/Dockerfile \
Expand Down
1 change: 1 addition & 0 deletions cmd/nomos/status/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func newTestClusterClient(t *testing.T, client client.Client, k8sClient kubernet
Sync: v1.RepoSyncStatus{LatestToken: "abc1234"},
},
}
//nolint:staticcheck // allow deprecated function for backwards compatibility
csClient := csfake.NewSimpleClientset(repoObj)

var dynamicObjs []runtime.Object
Expand Down
1 change: 1 addition & 0 deletions e2e/nomostest/new.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ func applyAutoPilotKeepAlive(nt *NT) error {
// to avoid adding the test label, to avoid deletion during cleanup
nt.Logger.Infof("applying %s", yamlPath)
patchOpts := []client.PatchOption{client.FieldOwner(FieldManager), client.ForceOwnership}
//nolint:staticcheck // allow deprecated field for backwards compatibility
if err := nt.KubeClient.Client.Patch(nt.Context, uObj, client.Apply, patchOpts...); err != nil {
return fmt.Errorf("failed to apply %s: %w", kinds.ObjectSummary(uObj), err)
}
Expand Down
1 change: 1 addition & 0 deletions e2e/nomostest/testkubeclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ func (tc *KubeClient) Apply(obj client.Object, opts ...client.PatchOption) error
tc.Logger.Debugf("applying %s", kinds.ObjectSummary(obj))
AddTestLabel(obj)
opts = append(opts, client.FieldOwner(FieldManager), client.ForceOwnership)
//nolint:staticcheck // allow deprecated field for backwards compatibility
Copy link
Contributor

@tiffanny29631 tiffanny29631 Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there plan to refactor the Patch function to align with new API?

return tc.Client.Patch(tc.Context, obj, client.Apply, opts...)
}

Expand Down
46 changes: 21 additions & 25 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleContainerTools/config-sync

go 1.24.11
go 1.25.0

require (
cloud.google.com/go/auth v0.18.0
Expand Down Expand Up @@ -43,22 +43,22 @@ require (
golang.org/x/mod v0.32.0
google.golang.org/api v0.261.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.34.3
k8s.io/apiextensions-apiserver v0.34.3
k8s.io/apimachinery v0.34.3
k8s.io/apiserver v0.34.3
k8s.io/cli-runtime v0.34.3
k8s.io/client-go v0.34.3
k8s.io/api v0.35.0
k8s.io/apiextensions-apiserver v0.35.0
k8s.io/apimachinery v0.35.0
k8s.io/apiserver v0.35.0
k8s.io/cli-runtime v0.35.0
k8s.io/client-go v0.35.0
k8s.io/cluster-registry v0.0.6
k8s.io/code-generator v0.34.3
k8s.io/code-generator v0.35.0
k8s.io/klog/v2 v2.130.1
k8s.io/kube-aggregator v0.34.3
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
k8s.io/kubectl v0.34.3
k8s.io/kubernetes v1.34.3
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
k8s.io/kube-aggregator v0.35.0
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
k8s.io/kubectl v0.35.0
k8s.io/kubernetes v1.35.0
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
sigs.k8s.io/cli-utils v0.37.3-0.20251021150641-5895ad6c17dd
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/controller-runtime v0.23.0
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231023142458-b9f29826ee83
sigs.k8s.io/controller-tools v0.18.0
sigs.k8s.io/kind v0.30.0
Expand Down Expand Up @@ -103,14 +103,12 @@ require (
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gobuffalo/flect v1.0.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/licenseclassifier/v2 v2.0.0 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
github.com/googleapis/gax-go/v2 v2.16.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -124,13 +122,11 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/onsi/gomega v1.38.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
Expand All @@ -141,6 +137,7 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sergi/go-diff v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
Expand All @@ -167,20 +164,19 @@ require (
golang.org/x/text v0.33.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.40.0 // indirect
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120174246-409b4a993575 // indirect
google.golang.org/grpc v1.78.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.34.3 // indirect
k8s.io/component-helpers v0.34.3 // indirect
k8s.io/controller-manager v0.34.0 // indirect
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
k8s.io/component-base v0.35.0 // indirect
k8s.io/component-helpers v0.35.0 // indirect
k8s.io/controller-manager v0.35.0 // indirect
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
)
Loading
Loading