:seedling: Bump k8s dependencies to v1.36.0 and update tooling by dependabot[bot] · Pull Request #2717 · operator-framework/operator-controller

dependabot · 2026-05-20T20:02:15Z

Description

Bump k8s dependencies to v1.36.0 and update tooling.

Bump k8s.io/kubernetes from v1.35.0 to v1.36.0 with all staging modules aligned to v0.36.0
Bump sigs.k8s.io/controller-tools from v0.20.1 to v0.21.0
Bump sigs.k8s.io/crdify from v0.5.1 to v0.6.0
Update SchemeBuilder to use k8s.io/apimachinery/pkg/runtime (moved from sigs.k8s.io/controller-runtime/pkg/scheme)
Suppress no-op diffs from controller-gen version bumps in generated files, CRDs, and manifests
Ignore controller-gen version annotation in CRD generator test

Reviewer Checklist

API Go Documentation
Tests: Unit Tests (and E2E Tests, if appropriate)
Comprehensive Commit Messages
Links to related GitHub Issue(s)

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

netlify · 2026-05-20T20:02:20Z

✅ Deploy Preview for olmv1 ready!

Name	Link
🔨 Latest commit	`f52b3bc`
🔍 Latest deploy log	https://app.netlify.com/projects/olmv1/deploys/6a29335ea56f750008ffc1bf
😎 Deploy Preview	https://deploy-preview-2717--olmv1.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
🤖 Make changes	Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

rashmigottipati

/hold

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Pull request overview

Copilot reviewed 14 out of 15 changed files in this pull request and generated 3 comments.

+	k8s.io/api v0.36.0
+	k8s.io/apiextensions-apiserver v0.36.0
+	k8s.io/apimachinery v0.36.0
+	k8s.io/apiserver v0.36.0
 	k8s.io/cli-runtime v0.35.1


+	sigs.k8s.io/controller-tools v0.21.0
+	sigs.k8s.io/crdify v0.6.0


pedjak · 2026-06-03T15:55:21Z

/label go-verdiff-override

@tmshort I hope we are ok with go upgrade, just learned that downstream go 1.26.3 is available since June 2.

openshift-ci · 2026-06-03T15:55:24Z

@pedjak: The label(s) `/label go-verdiff-override

cannot be applied. These labels are supported:acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, rebase/manual, cluster-config-api-changed, run-integration-tests, verified, ready-for-human-review, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/skip-dependent-bug-check, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labelsorlabels -> restricted_labelsinplugin.yaml`?

Details

In response to this:

/label go-verdiff-override
@tmshort I hope we are ok with go upgrade, just learned that downstream go 1.26.3 is available since June 2.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

rashmigottipati

/hold cancel

Copilot

Pull request overview

Copilot reviewed 18 out of 24 changed files in this pull request and generated 2 comments.

Files not reviewed (5)

api/v1/zz_generated.deepcopy.go: Language not supported
applyconfigurations/api/v1/clustercatalog.go: Language not supported
applyconfigurations/api/v1/clusterextension.go: Language not supported
applyconfigurations/api/v1/clusterobjectset.go: Language not supported
applyconfigurations/internal/internal.go: Language not supported

pedjak · 2026-06-09T19:43:34Z

+func filterVersionAnnotation(s string) string {
+	var lines []string
+	sc := bufio.NewScanner(strings.NewReader(s))
+	for sc.Scan() {
+ if !strings.Contains(sc.Text(), "controller-gen.kubebuilder.io/version") {


Fixed — switched to strings.Split which has no token size limit.

Copilot

Pull request overview

Copilot reviewed 18 out of 24 changed files in this pull request and generated 1 comment.

Files not reviewed (5)

api/v1/zz_generated.deepcopy.go: Language not supported
applyconfigurations/api/v1/clustercatalog.go: Language not supported
applyconfigurations/api/v1/clusterextension.go: Language not supported
applyconfigurations/api/v1/clusterobjectset.go: Language not supported
applyconfigurations/internal/internal.go: Language not supported

+	sc := bufio.NewScanner(strings.NewReader(s))
+	for sc.Scan() {
+ if !strings.Contains(sc.Text(), "controller-gen.kubebuilder.io/version") {
+ lines = append(lines, sc.Text())
 }


Copilot

Pull request overview

Copilot reviewed 19 out of 25 changed files in this pull request and generated 2 comments.

Files not reviewed (5)

api/v1/zz_generated.deepcopy.go: Language not supported
applyconfigurations/api/v1/clustercatalog.go: Language not supported
applyconfigurations/api/v1/clusterextension.go: Language not supported
applyconfigurations/api/v1/clusterobjectset.go: Language not supported
applyconfigurations/internal/internal.go: Language not supported

+	sc := bufio.NewScanner(strings.NewReader(s))
+	for sc.Scan() {
+ if !strings.Contains(sc.Text(), "controller-gen.kubebuilder.io/version") {
+ lines = append(lines, sc.Text())
 }


Copilot

Pull request overview

Copilot reviewed 14 out of 20 changed files in this pull request and generated 4 comments.

Files not reviewed (5)

api/v1/zz_generated.deepcopy.go: Language not supported
applyconfigurations/api/v1/clustercatalog.go: Language not supported
applyconfigurations/api/v1/clusterextension.go: Language not supported
applyconfigurations/api/v1/clusterobjectset.go: Language not supported
applyconfigurations/internal/internal.go: Language not supported

+func filterVersionAnnotation(s string) string {
+	var lines []string
+	sc := bufio.NewScanner(strings.NewReader(s))
+	for sc.Scan() {
+ if !strings.Contains(sc.Text(), "controller-gen.kubebuilder.io/version") {
+ lines = append(lines, sc.Text())
 }
- require.NoError(t, err1)
- require.NoError(t, err2)
- require.Equal(t, n1, n2)
- require.Equal(t, b1, b2)
 	}
+	return strings.Join(lines, "\n")


pedjak · 2026-06-09T19:11:28Z

/hold cancel

@tmshort @rashmigottipati I think this is ready for final review.

pedjak · 2026-06-09T19:44:06Z

Do we need to run make k8s-pin as part of this, or does this cleanly handle it?

Yes, k8s-pin is a dependency of make verify and runs automatically. It passes cleanly.

e2e and experimental-e2e: Waiting for metrics scraper to become ready... Might need to update prometheus.

Root cause was a missing NetworkPolicy for the prometheus-operator pod — the default-deny-all-traffic policy blocked its egress to the API server. Fixed in #2756 (merged). The prometheus version bump is no longer needed and has been reverted.

Why were so many Go APIs added (i.e. failing go-apidiff)? Was it due to controller-gen changes?

The SchemeBuilder type change is an upstream k8s 1.36 move from sigs.k8s.io/controller-runtime/pkg/scheme.Builder to k8s.io/apimachinery/pkg/runtime.SchemeBuilder. The generated file diffs have been reduced by adding logic to revert files where only the controller-gen version comment/annotation changed — PR now has 20 files instead of the original 63.

- Bump k8s.io/* staging modules to v0.36.0 - Bump controller-tools to v0.21.0 and crdify to v0.6.0 - Update SchemeBuilder to use k8s.io/apimachinery/pkg/runtime - Suppress no-op diffs from controller-gen version bumps in generated files, CRDs, and manifests - Ignore controller-gen version annotation in CRD generator test Co-Authored-By: Predrag Knezevic <pknezevi@redhat.com> Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

tmshort · 2026-06-10T14:01:37Z

+	@# Revert CRD files where the only change is the controller-gen version annotation
+	@for f in $$(git diff --name-only -- helm/ hack/tools/crd-generator/testdata/); do \
+ git diff --quiet -I 'controller-gen.kubebuilder.io/version' -- "$$f" && git restore --worktree -- "$$f" || true; \
+	done


It's probably fine to allow it to update the version info in the file; at least we'll know what version was used, and we won't have inconsistent "generated by" comments.
But I see your point, and we may choose to revisit this in the future.

It's probably fine to allow it to update the version info in the file; at least we'll know what version was used, and we won't have inconsistent "generated by" comments. But I see your point, and we may choose to revisit this in the future.
We got 60+ changed files with just ...generate by... comment change, as you spotted rightfully. IMHO, it does not make sense to commit if the real file logic is untouched.

tmshort · 2026-06-10T14:02:10Z

/approve

rashmigottipati

/lgtm

openshift-ci · 2026-06-10T14:05:40Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rashmigottipati, tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [tmshort]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

dependabotBot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels May 20, 2026

CopilotAI review requested due to automatic review settings May 20, 2026 20:02

CopilotAI reviewed May 20, 2026

openshift-ciBot requested review from pedjak and tmshort May 20, 2026 20:02

rashmigottipati reviewed May 20, 2026
View reviewed changes

openshift-ciBot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2026

dependabotBot changed the title ~~🌱 Bump the k8s-dependencies group with 2 updates~~🌱 Bump the k8s-dependencies group across 1 directory with 2 updatesMay 20, 2026

dependabotBotforce-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 9b704aa to d02c464Compare May 20, 2026 20:31

CopilotAI review requested due to automatic review settings May 26, 2026 21:39

dependabotBotforce-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from d02c464 to d2bcd24Compare May 26, 2026 21:39

CopilotAI reviewed May 26, 2026

dependabotBotforce-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch 2 times, most recently from 5fb8856 to aaaa412Compare June 2, 2026 19:50

CopilotAI review requested due to automatic review settings June 2, 2026 19:50

CopilotAI reviewed Jun 2, 2026

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from aaaa412 to c916376Compare June 3, 2026 15:13

CopilotAI review requested due to automatic review settings June 3, 2026 15:46

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from c916376 to ddc3098Compare June 3, 2026 15:46

Copilotstarted reviewing on behalf of pedjak June 3, 2026 15:47 View session

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from ddc3098 to d616a7dCompare June 3, 2026 15:48

CopilotAI reviewed Jun 3, 2026
View reviewed changes

pedjak added the go-verdiff-override label Jun 3, 2026

rashmigottipati reviewed Jun 3, 2026
View reviewed changes

openshift-ciBot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2026

pedjak changed the title ~~🌱 Bump the k8s-dependencies group across 1 directory with 2 updates~~🌱 Bump k8s dependencies to v1.36.0 and update toolingJun 3, 2026

CopilotAI reviewed Jun 9, 2026
View reviewed changes

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from d793a9b to 5097a7dCompare June 9, 2026 12:32

CopilotAI review requested due to automatic review settings June 9, 2026 12:38

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 5097a7d to 531a32aCompare June 9, 2026 12:38

Copilotstarted reviewing on behalf of pedjak June 9, 2026 12:38 View session

CopilotAI reviewed Jun 9, 2026
View reviewed changes

Comment threadhack/tools/crd-generator/main_test.go Outdated
Comment on lines 337 to 341
sc := bufio.NewScanner(strings.NewReader(s))
for sc.Scan() {
if !strings.Contains(sc.Text(), "controller-gen.kubebuilder.io/version") {
lines = append(lines, sc.Text())
}

CopilotAI review requested due to automatic review settings June 9, 2026 14:37

Copilotstarted reviewing on behalf of pedjak June 9, 2026 14:37 View session

CopilotAI reviewed Jun 9, 2026
View reviewed changes

Comment threadMakefile Outdated
Comment threadhack/tools/crd-generator/main_test.go Outdated
Comment on lines 337 to 341
sc := bufio.NewScanner(strings.NewReader(s))
for sc.Scan() {
if !strings.Contains(sc.Text(), "controller-gen.kubebuilder.io/version") {
lines = append(lines, sc.Text())
}

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 364e3d6 to 559ae6fCompare June 9, 2026 18:54

CopilotAI review requested due to automatic review settings June 9, 2026 19:01

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 559ae6f to 063cb27Compare June 9, 2026 19:01

Copilotstarted reviewing on behalf of pedjak June 9, 2026 19:01 View session

CopilotAI reviewed Jun 9, 2026
View reviewed changes

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 063cb27 to 37602f8Compare June 9, 2026 19:10

openshift-ciBot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2026

pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 37602f8 to f52b3bcCompare June 10, 2026 09:50

pedjak requested a review from rashmigottipati June 10, 2026 09:50

tmshort reviewed Jun 10, 2026
View reviewed changes

openshift-ciBot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 10, 2026

rashmigottipati approved these changes Jun 10, 2026
View reviewed changes

openshift-ciBot assigned rashmigottipati Jun 10, 2026

openshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2026

openshift-merge-botBot merged commit b63979e into mainJun 10, 2026
26 checks passed

dependabotBot deleted the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch June 10, 2026 14:10

		sigs.k8s.io/controller-tools v0.21.0
		sigs.k8s.io/crdify v0.6.0

Uh oh!

Conversation

dependabotBot commented on behalf of githubMay 20, 2026• edited by pedjak Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Reviewer Checklist

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Uh oh!

netlifyBot commented May 20, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for olmv1 ready!

Uh oh!

rashmigottipati left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

pedjak commented Jun 3, 2026

Uh oh!

openshift-ciBot commented Jun 3, 2026

Uh oh!

rashmigottipati left a comment

Choose a reason for hiding this comment

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

pedjakJun 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pedjak commented Jun 9, 2026

Uh oh!

pedjak commented Jun 9, 2026

Uh oh!

tmshortJun 10, 2026

Choose a reason for hiding this comment

Uh oh!

pedjakJun 10, 2026

Choose a reason for hiding this comment

Uh oh!

tmshort commented Jun 10, 2026

Uh oh!

rashmigottipati left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ciBot commented Jun 10, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

dependabotBot commented on behalf of githubMay 20, 2026•
edited by pedjak
Loading

netlifyBot commented May 20, 2026•
edited
Loading