Skip to content

Rebase to kubernetes 1.34.2#3742

Merged
kcp-ci-bot merged 4 commits intokcp-dev:mainfrom
mjudeikis:kubernetes.1.34.prep
Dec 9, 2025
Merged

Rebase to kubernetes 1.34.2#3742
kcp-ci-bot merged 4 commits intokcp-dev:mainfrom
mjudeikis:kubernetes.1.34.prep

Conversation

@mjudeikis
Copy link
Contributor

@mjudeikis mjudeikis commented Dec 4, 2025 •
edited
Loading

Summary

This PR bring in k/k 1.34.2 into kcp.
few main changes:

  1. Deprecated some code related to TMC, and these changed YAML files slightly.
  2. Kept GC code locks to we can evaluate this in main if we need to do something about it.
  3. Disable protoc support as extension server does not support it. And everything is an extension server based on KCP.

What Type of PR Is This?

/kind feature

Related Issue(s)

Fixes #3740

Diff for k/k kcp-dev/kubernetes#182

Release Notes

Rebase k/k 1.34.2

@kcp-ci-bot kcp-ci-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has signed the DCO. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 4, 2025
@mjudeikis
Copy link
Contributor Author

mjudeikis commented Dec 5, 2025

/retest

@kcp-ci-bot kcp-ci-bot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Dec 5, 2025
@mjudeikis mjudeikis force-pushed the kubernetes.1.34.prep branch from f5d33a7 to a0f8619 Compare December 8, 2025 12:23
mjudeikis
mjudeikis commented Dec 8, 2025
View reviewed changes
config/root-phase0/apiexport-cache.kcp.io.yaml
apiVersion: apis.kcp.io/v1alpha2
kind: APIExport
metadata:
creationTimestamp: null
Copy link
Contributor Author

@mjudeikis mjudeikis Dec 8, 2025

Choose a reason for hiding this comment

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

This was an artifact of some old synctarget related code I removed from the fork.

@mjudeikis
Copy link
Contributor Author

mjudeikis commented Dec 8, 2025

/retest

@mjudeikis mjudeikis changed the title MVP: rebase to kubernetes 1.34.2 Rebase to kubernetes 1.34.2 Dec 8, 2025
@kcp-ci-bot kcp-ci-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Dec 8, 2025
xrstf
xrstf reviewed Dec 8, 2025
View reviewed changes
xrstf
xrstf reviewed Dec 8, 2025
View reviewed changes
ntnn
ntnn requested changes Dec 8, 2025
View reviewed changes
@mjudeikis mjudeikis force-pushed the kubernetes.1.34.prep branch 3 times, most recently from 3d50ae4 to f74a488 Compare December 9, 2025 08:25
@mjudeikis
Copy link
Contributor Author

mjudeikis commented Dec 9, 2025

/retest

1 similar comment
@mjudeikis
Copy link
Contributor Author

mjudeikis commented Dec 9, 2025

/retest

@mjudeikis
Rebase to k/k 1.34 changes
18375fb 
Signed-off-by: Mangirdas Judeikis <[email protected]>
On-behalf-of: @SAP [email protected]
@mjudeikis mjudeikis force-pushed the kubernetes.1.34.prep branch from f74a488 to 18375fb Compare December 9, 2025 10:13
@mjudeikis
Copy link
Contributor Author

mjudeikis commented Dec 9, 2025

/retest
cI having bad day?

xrstf
xrstf approved these changes Dec 9, 2025
View reviewed changes
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

/approve
/hold in case @ntnn has more questions

@kcp-ci-bot kcp-ci-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 9, 2025
@kcp-ci-bot kcp-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2025
@kcp-ci-bot
Copy link
Contributor

kcp-ci-bot commented Dec 9, 2025

LGTM label has been added.

DetailsGit tree hash: a96370b1d2cc90bff9a23377bee745b926d49dcf

@kcp-ci-bot kcp-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2025
@ntnn
Copy link
Member

ntnn commented Dec 9, 2025

/lgtm
/approve
/hold cancel

@kcp-ci-bot kcp-ci-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 9, 2025
@kcp-ci-bot
Copy link
Contributor

kcp-ci-bot commented Dec 9, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ntnn, xrstf

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

@kcp-ci-bot kcp-ci-bot merged commit b5f250a into kcp-dev:main Dec 9, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ntnn ntnn ntnn requested changes

@xrstf xrstf xrstf approved these changes

Assignees

@xrstf xrstf

@ntnn ntnn

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has signed the DCO. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

feature: Rebase 1.34

4 participants

@mjudeikis @kcp-ci-bot @ntnn @xrstf