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.

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

update smd to 4.2.3 #111557

Merged
merged 1 commit into from Aug 2, 2022
Merged

update smd to 4.2.3 #111557

merged 1 commit into from Aug 2, 2022

Conversation

alexzielenski
Copy link
Contributor

@alexzielenski alexzielenski commented Jul 30, 2022 •
edited

brings in fixes to exponential recursion bug, adds field level override ability to support another backport effort

Comparison between two versions: https://github.com/kubernetes-sigs/structured-merge-diff/compare/v4.2.1..v4.2.3

What type of PR is this?

/kind bug

What this PR does / why we need it:

  1. Fixes exponentially expanding recursion bug when first creating an object with a fully deduced type. Details: Fix exponential merge recursion kubernetes-sigs/structured-merge-diff#222.

  2. Adds ability to override structType annotation with field-level references

Which issue(s) this PR fixes:

fixes #109099
required for #110495

Special notes for your reviewer:

Ran

hack/pin-dependency.sh sigs.k8s.io/structured-merge-diff/v4 v4.2.3
hack/update-internal-modules.sh
hack/update-vendor.sh

Does this PR introduce a user-facing change?

Fix performance issue when creating large objects using SSA with fully unspecified schemas (preserveUnknownFields).

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

/cc @apelisse

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 30, 2022
@alexzielenski alexzielenski changed the title apiserver: update smd to 4.2.2 update smd to 4.2.2 Jul 30, 2022
@k8s-ci-robot k8s-ci-robot added area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 30, 2022
This was referenced Jul 30, 2022
Merged
Closed
@liggitt
Copy link
Member

liggitt commented Jul 30, 2022

/lgtm
/approve

thanks for the fix!

@aojea
Copy link
Member

aojea commented Aug 1, 2022

🤔
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 1, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 1, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexzielenski, aojea, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 1, 2022
@aojea
Copy link
Member

aojea commented Aug 1, 2022

@alexzielenski: PR needs rebase.

ahh, it needs rebase, I was surprised the PR didn't pick the approve and lgtm labels from Jordan

@alexzielenski alexzielenski changed the title update smd to 4.2.2 update smd to 4.2.3 Aug 2, 2022
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 2, 2022
@alexzielenski
Copy link
Contributor Author

rebased and also changed 4.2.2 to 4.2.3

@apelisse
Copy link
Member

apelisse commented Aug 2, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 2, 2022
@k8s-ci-robot k8s-ci-robot merged commit 22eab13 into kubernetes:master Aug 2, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Aug 2, 2022
@fedebongio
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 2, 2022
@silenceper silenceper mentioned this pull request Aug 13, 2022
Closed
@aojea aojea mentioned this pull request Aug 19, 2022
Closed
@liggitt liggitt mentioned this pull request Aug 19, 2022
Merged
@alexzielenski alexzielenski deleted the update-smd-422 branch November 16, 2022 18:50
k8s-ci-robot added a commit that referenced this pull request Dec 2, 2022
@k8s-ci-robot
Merge pull request #111914 from aojea/crd_recursion_bug_1_23
5f01bb4 
cherry pick pr #111557 to 1.23 :update smd to 4.2.3
k8s-ci-robot added a commit that referenced this pull request Jan 12, 2023
@k8s-ci-robot
Merge pull request #111915 from aojea/crd_recursion_bug_1_24
aeb26cd 
cherry pick pr #111557 to 1.24 :update smd to 4.2.3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apelisse apelisse Awaiting requested review from apelisse

Assignees

@apelisse apelisse

@aojea aojea

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

apiserver: Request for a custom resource leads to > 1000% CPU usage increase for more than 10min
6 participants
@alexzielenski @liggitt @aojea @k8s-ci-robot @apelisse @fedebongio