Skip to content

Cherry-pick patches from 1.31 to 1.32 #65

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.

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
wants to merge 15 commits into
base: openshift-apiserver-4.19-kubernetes-1.32.1
Choose a base branch
from

Conversation

dinhxuanvu
Copy link
Member

Cherry-pick patches from 1.31 to 1.32

smarterclayton and others added 15 commits March 26, 2025 13:25
The tests need to be rewritten to be safe for concurrent use and for
work in contended environments. Disabling the worst offenders and fixing
reuse issues around the tests here.

Origin-commit: b6281a54c84f20c2f0d35d6a44881e83b2e75227

Kubernetes-commit: 28d7cd994b1f94603356842e85c034738aacbbdd
Kubernetes-commit: 09525cbe93930c509abec83a7366e227546b421d
Origin-commit: b992ee2fcb5cd610e9242c3165908b6bc6e423f5

UPSTREAM: <carry>: filter out RBR and SCC paths from OpenAPI

Origin-commit: 5ce9a77a641ec9d0399226af572e429317d3daf6

UPSTREAM: <carry>: filter out RBR and SCC paths from OpenAPI

Origin-commit: 0ee08c7a5e138e8df2bd7d010e9ab59a6543cf63

Kubernetes-commit: c27b04e6a373dd59cf0da17ab5944f653b1a8a1c

UPSTREAM: <carry>: fix filtering out CustomResourceQuota paths from OpenAPI

surprisingly removing the paths after the spec was built worked in the past.
with the upgrade to the new version the paths must be removed before building the spec.

Co-authored-by: Lukasz Szaszkiewicz <[email protected]>
…ly to admission plugin

Kubernetes-commit: 5c0fd14762e63be316b522ed694a65e59fd62056
Origin-commit: beac12d815b4099cfd4f4d953da4b8789054be51

Kubernetes-commit: 4dd78ae36bc5203d4dc46f975e226ffeaadbb203
Origin-commit: c68807a9d7970292a2e9812b9245404938709183

Kubernetes-commit: 954a54fec57a088066ab9ef87935439aa8595d4d
…to genericapiserver

Origin-commit: 24960e3b3b0b1805a835a944ae3ba45dc980ce45

Kubernetes-commit: 15571386ecbfa37d6e2185f73dfe07952bc02aa7
Pulls in openshift/kubernetes#1681 and openshift/kubernetes#1676

Note that normally, we would move the patch to a common place and reuse it for kas, oas and oauth, but we are racing against the clock.
…navailable errors for the etcd health checker client
The existing patch retried any etcd error returned from storage with the code "Unavailable". Writes
can only be safely retried if the client can be absolutely sure that the initial attempt ended
before persisting any changes. The "Unavailable" code includes errors like "timed out" that can't be
safely retried for writes.
@openshift-ci openshift-ci bot requested review from deads2k and ingvagabund March 26, 2025 18:04
@dinhxuanvu
Copy link
Member Author

@p0lyn0mial PTAL

@p0lyn0mial
Copy link

Please also create proof PRs for oas and oauth-api - once these PRs are green we can review/merge.

@bertinatto
Copy link
Member

Here's a oauth-apiserver proof PR: openshift/oauth-apiserver#132

wangke19 added a commit to wangke19/openshift-apiserver that referenced this pull request Apr 24, 2025
@wangke19
Copy link

openshift-apiserver proof PR: openshift/openshift-apiserver#486

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.