[Prototype] Fix for PATCH without tier prefix #9445
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marvin-tigera
added
release-note-required
caseydavenport
commented
Nov 5, 2024
| // Canonicalize the old object's name as well to make sure it's consistent. | ||
| // This typically shouldn't be needed for update requests, but is necessary in PATCH | ||
| // requests because we may need to strip the tier earlier in the pipeline to pass earlier validation. | ||
| old.(*calico.NetworkPolicy).Name = canonicalizePolicyName(old) | ||
| } |
There was a problem hiding this comment.
Assuming this approach even has legs, we'll need to make this change for global policies as well.
caseydavenport
commented
Nov 5, 2024
| @@ -417,11 +419,27 @@ func (rs *resourceStore) GuaranteedUpdate( | |||
| klog.Errorf("checking preconditions (%s)", err) | |||
| return err | |||
| } | |||
|
|
|||
| // update the object by applying the userUpdate func & encode it | |||
| updatedObj, ttl, err := userUpdate(curState.obj, *curState.meta) | |||
| if err != nil { | |||
There was a problem hiding this comment.
Probably want to check the exact error message here.
caseydavenport
commented
Nov 5, 2024
| // object without the tier in the name, in which case we need to retry the update against the | ||
| // object without the tier in the name. | ||
| switch curState.obj.(type) { | ||
| case *v3.GlobalNetworkPolicy: |
There was a problem hiding this comment.
Should probably only execute this logic if the tier is "default"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This is one attempt at fixing #9437
Basically, we try the update as provided. If it fails, then we retry it removing the "tier" from the object. This allows us to call applyPatch on an object without the tier prefix, which passes the name validation.
Once it passes the applyPatch name validation, it continues on to PrepareForUpdate, at which point we need to re-canonicalize the objects to include the tier prefix on them for storage...
I am not sure this is a viable solution - we need to think about what happens if there actually are policies in different tiers and someone tries to send a PATCH. I think it might just be OK, because in the second case you would need to specify the tier name (it's only for default that this is really a problem?)
At a minimum, for this change to go in we'd want to also:
Related issues/PRs
Todos
Release Note
Reminder for the reviewer
Make sure that this PR has the correct labels and milestone set.
Every PR needs one
docs-*label.docs-pr-required: This change requires a change to the documentation that has not been completed yet.docs-completed: This change has all necessary documentation completed.docs-not-required: This change has no user-facing impact and requires no docs.Every PR needs one
release-note-*label.release-note-required: This PR has user-facing changes. Most PRs should have this label.release-note-not-required: This PR has no user-facing changes.Other optional labels:
cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.