Skip to content

[WIP] MCO-2007: Update MCO dependencies to Kubernetes 1.35#5603

Open
dkhater-redhat wants to merge 3 commits intoopenshift:mainfrom
dkhater-redhat:upgrade-go-1.25.6
Open

[WIP] MCO-2007: Update MCO dependencies to Kubernetes 1.35#5603
dkhater-redhat wants to merge 3 commits intoopenshift:mainfrom
dkhater-redhat:upgrade-go-1.25.6

Conversation

@dkhater-redhat
Copy link
Contributor

@dkhater-redhat dkhater-redhat commented Jan 28, 2026 •
edited
Loading

- What I did
Upgraded Machine Config Operator to Kubernetes v1.35:

  1. Updated Go version to 1.25.3 to match CI builder image
  2. Bumped all k8s.io dependencies from v0.34.1 to v0.35.0
  3. Upgraded controller-runtime from v0.20.1 to v0.21.0
  4. Updated OpenShift API and client-go dependencies

- How to verify it

  1. Verify Go version
    grep "^go " go.mod # Should show: go 1.25.3

  2. Verify k8s dependencies
    grep "k8s.io/(api|client-go|kubernetes)" go.mod | grep -v "=>"
    Should show v0.35.0 and v1.35.0

- Description for the changelog

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 28, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dkhater-redhat

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 28, 2026
@dkhater-redhat dkhater-redhat force-pushed the upgrade-go-1.25.6 branch 3 times, most recently from 23a382f to f5072a7 Compare January 28, 2026 20:04
@dkhater-redhat dkhater-redhat changed the title Upgrade go 1.25.6 MCO-2007: Update MCO dependencies to Kubernetes 1.35 Jan 28, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 28, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 28, 2026 •
edited by openshift-ci bot
Loading

@dkhater-redhat: This pull request references MCO-2007 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "4.22.0" version, but no target version was set.

Details

In response to this:

- What I did

- How to verify it

- Description for the changelog

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 openshift-eng/jira-lifecycle-plugin repository.

@dkhater-redhat dkhater-redhat force-pushed the upgrade-go-1.25.6 branch 4 times, most recently from ce7954c to 03c5328 Compare January 28, 2026 22:16
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 29, 2026 •
edited by openshift-ci bot
Loading

@dkhater-redhat: This pull request references MCO-2007 which is a valid jira issue.

Details

In response to this:

- What I did
Upgraded Machine Config Operator to Kubernetes v1.35:

  1. Updated Go version to 1.25.3 to match CI builder image
  2. Bumped all k8s.io dependencies from v0.34.1 to v0.35.0
  3. Upgraded controller-runtime from v0.20.1 to v0.21.0
  4. Updated OpenShift API and client-go dependencies

- How to verify it

Verify Go version

grep "^go " go.mod # Should show: go 1.25.3

Verify k8s dependencies

grep "k8s.io/(api|client-go|kubernetes)" go.mod | grep -v "=>"

Should show v0.35.0 and v1.35.0

- Description for the changelog

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 29, 2026 •
edited by openshift-ci bot
Loading

@dkhater-redhat: This pull request references MCO-2007 which is a valid jira issue.

Details

In response to this:

- What I did
Upgraded Machine Config Operator to Kubernetes v1.35:

  1. Updated Go version to 1.25.3 to match CI builder image
  2. Bumped all k8s.io dependencies from v0.34.1 to v0.35.0
  3. Upgraded controller-runtime from v0.20.1 to v0.21.0
  4. Updated OpenShift API and client-go dependencies

- How to verify it

  1. Verify Go version
    grep "^go " go.mod # Should show: go 1.25.3

  2. Verify k8s dependencies
    grep "k8s.io/(api|client-go|kubernetes)" go.mod | grep -v "=>"

Should show v0.35.0 and v1.35.0

- Description for the changelog

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 29, 2026 •
edited by openshift-ci bot
Loading

@dkhater-redhat: This pull request references MCO-2007 which is a valid jira issue.

Details

In response to this:

- What I did
Upgraded Machine Config Operator to Kubernetes v1.35:

  1. Updated Go version to 1.25.3 to match CI builder image
  2. Bumped all k8s.io dependencies from v0.34.1 to v0.35.0
  3. Upgraded controller-runtime from v0.20.1 to v0.21.0
  4. Updated OpenShift API and client-go dependencies

- How to verify it

  1. Verify Go version
    grep "^go " go.mod # Should show: go 1.25.3

  2. Verify k8s dependencies
    grep "k8s.io/(api|client-go|kubernetes)" go.mod | grep -v "=>"
    Should show v0.35.0 and v1.35.0

- Description for the changelog

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 openshift-eng/jira-lifecycle-plugin repository.

isabella-janssen
isabella-janssen reviewed Jan 30, 2026
View reviewed changes
Copy link
Member

@isabella-janssen isabella-janssen left a comment

Choose a reason for hiding this comment

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

Do these packages in the replace section need to be updated also? https://github.com/dkhater-redhat/machine-config-operator/blob/b5095ebf2ce1a66b5c919970bcb57dbe996da4d2/go.mod#L426-L456

@dkhater-redhat dkhater-redhat force-pushed the upgrade-go-1.25.6 branch 5 times, most recently from 03c5328 to 70336f2 Compare February 2, 2026 16:24
@dkhater-redhat
Copy link
Contributor Author

dkhater-redhat commented Feb 2, 2026

@isabella-janssen openshift/kubernetes hasn't been rebased to Kubernetes 1.35 yet! idk why the tests passed to begin with lol

@dkhater-redhat dkhater-redhat changed the title MCO-2007: Update MCO dependencies to Kubernetes 1.35 [WIP] MCO-2007: Update MCO dependencies to Kubernetes 1.35 Feb 2, 2026
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 2, 2026
@dkhater-redhat
Copy link
Contributor Author

dkhater-redhat commented Feb 2, 2026

/hold waiting for https://github.com/openshift/kubernetes/pull/2555/files to merge

@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 Feb 2, 2026
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 25, 2026
@dkhater-redhat
Copy link
Contributor Author

dkhater-redhat commented Mar 5, 2026

/unhold
https://github.com/openshift/kubernetes/pull/2555/files has merged

@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 Mar 5, 2026
@dkhater-redhat
upgrade go version to 1.25.3, kube bump to v1.35
19039c3 
The CI builder image uses Go 1.25.3, so we set go.mod to match.

This fixes the build error:
go: go.mod requires go >= 1.25.6 (running go 1.25.3; GOTOOLCHAIN=local)
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 5, 2026
@dkhater-redhat
Update kubernetes dependencies to 1.35
ea94b3d 
Update openshift/kubernetes to latest commit from release-4.22 branch
(d18f3f005eaa) which includes the kubernetes 1.35 rebase.

Updates:
- k8s.io/* packages: v0.35.0 -> v0.35.1
- github.com/openshift/kubernetes: v1.30.1-0.20251028145634-9e794b89909a -> v1.30.1-0.20260305123649-d18f3f005eaa
- github.com/openshift/api: updated to latest
- github.com/openshift/client-go: updated to latest
- github.com/openshift/library-go: updated to latest
- vendor: regenerated with go mod vendor
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 5, 2026

@dkhater-redhat: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-op-1of2 70336f2 link true /test e2e-gcp-op-1of2
ci/prow/e2e-gcp-op-2of2 70336f2 link true /test e2e-gcp-op-2of2
ci/prow/e2e-gcp-op-ocl-part2 ea94b3d link false /test e2e-gcp-op-ocl-part2
ci/prow/verify ea94b3d link true /test verify
ci/prow/e2e-openstack ea94b3d link false /test e2e-openstack
ci/prow/e2e-aws-ovn-upgrade ea94b3d link true /test e2e-aws-ovn-upgrade
ci/prow/okd-scos-images ea94b3d link true /test okd-scos-images
ci/prow/e2e-gcp-op-single-node ea94b3d link true /test e2e-gcp-op-single-node
ci/prow/unit ea94b3d link true /test unit
ci/prow/e2e-gcp-op-part2 ea94b3d link true /test e2e-gcp-op-part2
ci/prow/images ea94b3d link true /test images
ci/prow/e2e-gcp-op-ocl-part1 ea94b3d link false /test e2e-gcp-op-ocl-part1
ci/prow/e2e-hypershift ea94b3d link true /test e2e-hypershift
ci/prow/e2e-gcp-op-part1 ea94b3d link true /test e2e-gcp-op-part1
ci/prow/e2e-gcp-op-ocl ea94b3d link false /test e2e-gcp-op-ocl
ci/prow/e2e-aws-ovn ea94b3d link true /test e2e-aws-ovn
ci/prow/bootstrap-unit ea94b3d link true /test bootstrap-unit

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@dkhater-redhat @claude
Fix features.FeatureSets API call in e2e-bootstrap test
fcbe37e 
The features.FeatureSets() API signature changed to require a major
version parameter as the first argument. Updated the test to:

- Import github.com/blang/semver/v4 for version parsing
- Use semver.ParseTolerant() to parse the release version from
  controllerConfig.Spec.ReleaseImage
- Extract the major version and pass it to features.FeatureSets()

This ensures the code works dynamically with different OpenShift
versions (4.x, 5.x, etc.) instead of hardcoding a version number.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yuqi-zhang yuqi-zhang Awaiting requested review from yuqi-zhang

1 more reviewer

@isabella-janssen isabella-janssen isabella-janssen left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dkhater-redhat @openshift-ci-robot @isabella-janssen @openshift-merge-robot