Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Rebase 1.31 #60

Merged
merged 14 commits into from
Nov 12, 2024
Merged

Rebase 1.31 #60

merged 14 commits into from
Nov 12, 2024

Conversation

dinhxuanvu
Copy link
Member

Cherry-pick carry patches to 4.18/1.31

smarterclayton and others added 14 commits November 5, 2024 11:42
@smarterclayton @dinhxuanvu
UPSTREAM: 00000: gRPC tests for encryption envelope are flaky
85b8fd1 
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
@mfojtik @dinhxuanvu
UPSTREAM: 74956: apiserver: switch authorization to use protobuf client
e808c75 
Kubernetes-commit: 09525cbe93930c509abec83a7366e227546b421d
@sttts @p0lyn0mial @dinhxuanvu
UPSTREAM: <carry>: filter out CustomResourceQuota paths from OpenAPI
34c77c6 
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 <lukasz.szaszkiewicz@gmail.com>
@p0lyn0mial @dinhxuanvu
UPSTREAM: <carry>: create termination events
66ea51d
@deads2k @dinhxuanvu
UPSTREAM: <carry>: kube-apiserver: add our immortal namespaces direct…
04d33ea 
…ly to admission plugin

Kubernetes-commit: 5c0fd14762e63be316b522ed694a65e59fd62056
@rphillips @dinhxuanvu
UPSTREAM: <carry>: disable AES24, not supported by FIPS
da934e9 
Origin-commit: beac12d815b4099cfd4f4d953da4b8789054be51

Kubernetes-commit: 4dd78ae36bc5203d4dc46f975e226ffeaadbb203
@tkashem @dinhxuanvu
UPSTREAM: <carry>: Bug 1852056: change etcd health check timeout to 10s
6e4ebf3 
Origin-commit: c68807a9d7970292a2e9812b9245404938709183

Kubernetes-commit: 954a54fec57a088066ab9ef87935439aa8595d4d
@juanvallejo @dinhxuanvu
UPSTREAM: <carry>: openshift-apiserver: add RemoveOpenAPIData method …
7e15ab6 
…to genericapiserver

Origin-commit: 24960e3b3b0b1805a835a944ae3ba45dc980ce45

Kubernetes-commit: 15571386ecbfa37d6e2185f73dfe07952bc02aa7
@p0lyn0mial @dinhxuanvu
UPSTREAM: <carry>: openshift-apiserver: ignored namespace lifecycle …
11ded64 
…resources
@tkashem @dinhxuanvu
UPSTREAM: <carry>: respect user specified timeout for long running re…
83db2ba 
…quests
@p0lyn0mial @dinhxuanvu
UPSTREAM: <carry>: retry etcd Unavailable errors
02c2009 
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.
@p0lyn0mial @dinhxuanvu
UPSTREAM: <carry>: add etcd3RetryingProberMonitor for retrying etcd U…
9168d9b 
…navailable errors for the etcd health checker client
@p0lyn0mial @dinhxuanvu
UPSTREAM: <carry>: retry_etcdclient: expose retry logic functionality
85ad0c7
@p0lyn0mial @dinhxuanvu
UPSTREAM: <carry>: replace newETCD3ProberMonitor with etcd3RetryingPr…
fb9ea68 
…oberMonitor
@openshift-ci openshift-ci bot requested review from deads2k and ingvagabund November 5, 2024 16:47
@dinhxuanvu
Copy link
Member Author

@p0lyn0mial @tkashem PTAL

@dinhxuanvu dinhxuanvu mentioned this pull request Nov 5, 2024
Merged
@p0lyn0mial
Copy link

@dinhxuanvu did you run into any issues when merging the patches?

@dinhxuanvu I see that some e2e tests for openshift-apiserver failed. Are these failures related to changes in this PR?

@dinhxuanvu
Copy link
Member Author

@dinhxuanvu did you run into any issues when merging the patches?

@dinhxuanvu I see that some e2e tests for openshift-apiserver failed. Are these failures related to changes in this PR?

No issues during cherry-picking patches for KAS. There are some issues with unit tests on OAS but I'm fixing them up right now. Just upstream changes. No major issues so far.

@p0lyn0mial
Copy link

There are some issues with unit tests on OAS but I'm fixing them up right now

mhm, I think that all e2e jobs failed. I checked https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_openshift-apiserver/458/pull-ci-openshift-openshift-apiserver-master-e2e-aws-ovn/1853871937520930816/artifacts/e2e-aws-ovn/gather-extra/artifacts/pods/openshift-apiserver_apiserver-65bf844bcb-rm9sj_openshift-apiserver.log

and it looks like that OAS didn't start due to:

cmd.go:74] failed to initialize admission plugin "ResourceQuota": missing quotaConfiguration

I think we should ensure at least some e2e tests pass to confirm that the changes in this PR are correct and no further changes are needed before merging. WDYT?

@dinhxuanvu
Copy link
Member Author

dinhxuanvu commented Nov 6, 2024 •
edited
Loading

I think we should ensure at least some e2e tests pass to confirm that the changes in this PR are correct and no further changes are needed before merging. WDYT?

I pushed some changes. I expect unit tests to pass now and we can see some clear signals on e2e. Let see if we bump into any issues. When CI is green on OAS, we can merge KAS.

@tkashem
Copy link

tkashem commented Nov 11, 2024

the proof pr is green

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2024
@dinhxuanvu
Copy link
Member Author

@p0lyn0mial Ready for merge.

@p0lyn0mial p0lyn0mial merged commit 0f10e42 into openshift:openshift-apiserver-4.18-kubernetes-1.31.1 Nov 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@ingvagabund ingvagabund Awaiting requested review from ingvagabund

Assignees

@tkashem tkashem

Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@dinhxuanvu @p0lyn0mial @tkashem @smarterclayton @mfojtik @sttts @deads2k @rphillips @juanvallejo