Skip to content

fix: prevent SSA from creating CR while CRD terminating #132467

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
Merged
merged 1 commit into from
Jun 24, 2025
Merged

fix: prevent SSA from creating CR while CRD terminating #132467

merged 1 commit into from
Jun 24, 2025
+77 −6

Conversation

sdowell
Copy link
Contributor

@sdowell sdowell commented Jun 23, 2025

This change adds consistent validation for server side apply to prevent new CustomResources from being creating while its
CustomResourceDefinition is in the terminating state.

What type of PR is this?

/kind bug

What this PR does / why we need it:

Normally when a CustomResourceDefinition is terminating, new CustomResources of that type are not allowed to be created. The validation was not implemented for SSA, meaning that CustomResources for a terminating CRD could still be created if the object is applied using SSA.

Which issue(s) this PR is related to:

Fixes #121490

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fixed an issue which allowed Custom Resources to be created with Server-Side Apply even when its CustomResourceDefinition was terminating.

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

@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. labels Jun 23, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @sdowell!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 23, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @sdowell. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 23, 2025
@k8s-ci-robot k8s-ci-robot requested review from jpbetz and roycaihw June 23, 2025 17:36
@sdowell sdowell force-pushed the ssa-terminating branch 3 times, most recently from bcbaa59 to 07fbb8a Compare June 23, 2025 18:08
@sdowell
Copy link
Contributor Author

sdowell commented Jun 23, 2025

/cc @cici37

@k8s-ci-robot k8s-ci-robot requested a review from cici37 June 23, 2025 22:05
@liggitt
Copy link
Member

liggitt commented Jun 24, 2025

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 24, 2025
@liggitt
Copy link
Member

liggitt commented Jun 24, 2025

also check the linter warning:

	_, err = noxuResourceClient.Apply(t.Context(), name, instance, metav1.ApplyOptions{FieldManager: "manager"})

@liggitt
Copy link
Member

liggitt commented Jun 24, 2025

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: fb08382bf601e4fda54be530ac50f20a8453c834

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2025
@sdowell
fix: prevent SSA from creating CR while CRD terminating
6f1295a 
This change adds consistent validation for server side apply to prevent
new CustomResources from being creating while its
CustomResourceDefinition is in the terminating state.
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2025
@k8s-ci-robot k8s-ci-robot requested a review from liggitt June 24, 2025 18:04
@liggitt
Copy link
Member

liggitt commented Jun 24, 2025

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 24, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 98476752f9c3651a67996ed957d969a055962dd9

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, sdowell

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 merged commit ec80dca into kubernetes:master Jun 24, 2025
13 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.34 milestone Jun 24, 2025
This was referenced Jun 25, 2025
Open
Open
chuangw6 pushed a commit to chuangw6/kubernetes that referenced this pull request Jun 26, 2025
@k8s-ci-robot @chuangw6
Merge pull request kubernetes#132467 from sdowell/ssa-terminating
65c1bd0 
fix: prevent SSA from creating CR while CRD terminating
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpbetz jpbetz Awaiting requested review from jpbetz

@roycaihw roycaihw Awaiting requested review from roycaihw

@cici37 cici37 Awaiting requested review from cici37

@liggitt liggitt Awaiting requested review from liggitt

Assignees

@liggitt liggitt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.34
Development

Successfully merging this pull request may close these issues.

Custom resource objects can be created during CRD Termination using server-side apply
3 participants
@sdowell @k8s-ci-robot @liggitt