Skip to content

🌱 Bump k8s dependencies to v1.36.0 and update tooling#2717

Open
dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/go_modules/k8s-dependencies-20ddd3de1b
Open

🌱 Bump k8s dependencies to v1.36.0 and update tooling#2717
dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/go_modules/k8s-dependencies-20ddd3de1b

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github May 20, 2026 •
edited by pedjak
Loading

Copy link
Copy Markdown
Contributor

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)

@dependabot dependabot Bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels May 20, 2026
Copilot AI review requested due to automatic review settings May 20, 2026 20:02
Copilot AI reviewed May 20, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@netlify

netlify Bot commented May 20, 2026 •
edited
Loading

Copy link
Copy Markdown

✅ Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 559ae6f
🔍 Latest deploy log https://app.netlify.com/projects/olmv1/deploys/6a28617066f7a40008b2f06a
😎 Deploy Preview https://deploy-preview-2717--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

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.

@openshift-ci openshift-ci Bot requested review from pedjak and tmshort May 20, 2026 20:02
rashmigottipati
rashmigottipati reviewed May 20, 2026
View reviewed changes

@rashmigottipati rashmigottipati left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2026
@dependabot dependabot Bot changed the title 🌱 Bump the k8s-dependencies group with 2 updates 🌱 Bump the k8s-dependencies group across 1 directory with 2 updates May 20, 2026
@dependabot dependabot Bot force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 9b704aa to d02c464 Compare May 20, 2026 20:31
Copilot AI review requested due to automatic review settings May 26, 2026 21:39
@dependabot dependabot Bot force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from d02c464 to d2bcd24 Compare May 26, 2026 21:39
Copilot AI reviewed May 26, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@dependabot dependabot Bot force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch 2 times, most recently from 5fb8856 to aaaa412 Compare June 2, 2026 19:50
Copilot AI review requested due to automatic review settings June 2, 2026 19:50
Copilot AI reviewed Jun 2, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from aaaa412 to c916376 Compare June 3, 2026 15:13
Copilot AI review requested due to automatic review settings June 3, 2026 15:46
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from c916376 to ddc3098 Compare June 3, 2026 15:46
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from ddc3098 to d616a7d Compare June 3, 2026 15:48
Copilot AI reviewed Jun 3, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

Comment thread go.mod Outdated
Comment on lines 39 to 43
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
Comment thread go.mod
Comment on lines +51 to +52
sigs.k8s.io/controller-tools v0.21.0
sigs.k8s.io/crdify v0.6.0
Comment thread go.mod
@pedjak

pedjak commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

/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

openshift-ci Bot commented Jun 3, 2026

Copy link
Copy Markdown

@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
rashmigottipati reviewed Jun 3, 2026
View reviewed changes

@rashmigottipati rashmigottipati left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/hold cancel

@openshift-ci openshift-ci Bot 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 pedjak changed the title 🌱 Bump the k8s-dependencies group across 1 directory with 2 updates 🌱 Bump k8s dependencies to v1.36.0 and update tooling Jun 3, 2026
@tmshort

tmshort commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

e2e and experimental-e2e:

Waiting for metrics scraper to become ready...

Might need to update prometheus.

@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 3e31a38 to aa3206d Compare June 9, 2026 11:08
@pedjak

pedjak commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Why were so many Go APIs added (i.e. failing go-apidiff)? Was it due to controller-gen changes? EDIT: looks as though an API was moved from sigs to standard:

SchemeBuilder: changed from *sigs.k8s.io/controller-runtime/pkg/scheme.Builder to k8s.io/apimachinery/pkg/runtime.SchemeBuilder

Yes, but without real change - just the comment changed. I have fixed that by introducing the logic to detect that and revert the files.

Copilot AI review requested due to automatic review settings June 9, 2026 11:29
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from aa3206d to e5b061a Compare June 9, 2026 11:29
Copilot AI reviewed Jun 9, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 21 out of 27 changed files in this pull request and generated no new 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 pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from e5b061a to b0c23db Compare June 9, 2026 11:34
@pedjak

pedjak commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Might need to update prometheus.

It looks like it helped - e2e tests are now green @tmshort

Copilot AI review requested due to automatic review settings June 9, 2026 12:20
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from b0c23db to d793a9b Compare June 9, 2026 12:20
Copilot AI reviewed Jun 9, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

Comment thread hack/tools/crd-generator/main_test.go Outdated
Comment on lines +335 to +339
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") {
Comment thread .github/workflows/e2e.yaml Outdated
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from d793a9b to 5097a7d Compare June 9, 2026 12:32
Copilot AI review requested due to automatic review settings June 9, 2026 12:38
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 5097a7d to 531a32a Compare June 9, 2026 12:38
Copilot AI reviewed Jun 9, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

Comment thread hack/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())
}
Copilot AI review requested due to automatic review settings June 9, 2026 14:37
Copilot AI reviewed Jun 9, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

Comment thread Makefile Outdated
Comment thread hack/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 pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 364e3d6 to 559ae6f Compare June 9, 2026 18:54
Copilot AI review requested due to automatic review settings June 9, 2026 19:01
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 559ae6f to 063cb27 Compare June 9, 2026 19:01
Copilot AI reviewed Jun 9, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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

Comment thread hack/tools/crd-generator/main_test.go Outdated
Comment on lines +335 to +343
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")
Comment thread Makefile
Comment thread Makefile Outdated
Comment thread Makefile
@dependabot @claude @pedjak
🌱 Bump k8s dependencies to v1.36.0 and update tooling
37602f8 
- 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: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@pedjak pedjak force-pushed the dependabot/go_modules/k8s-dependencies-20ddd3de1b branch from 063cb27 to 37602f8 Compare June 9, 2026 19:10
@pedjak

pedjak commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

/hold cancel

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

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rashmigottipati rashmigottipati rashmigottipati left review comments

Copilot code review Copilot Copilot left review comments

@pedjak pedjak Awaiting requested review from pedjak

@tmshort tmshort Awaiting requested review from tmshort

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file go Pull requests that update Go code go-apidiff-override

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pedjak @tmshort @rashmigottipati