Filter unknown custom resources in Delete- and ToggleTask #1552
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
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
ANeumann82
requested review from
alenkacz,
gerred,
kensipe,
nfnt and
zen-dog
as code owners
…unknown object types Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
ANeumann82
changed the title
zen-dog
approved these changes
Jun 8, 2020
| @@ -67,6 +72,30 @@ func isNamespaced(gvk schema.GroupVersionKind, di discovery.CachedDiscoveryInter | |||
| return false, fmt.Errorf("a resource with GVK %v seems to be missing in API resource list", gvk) | |||
| } | |||
|
|
|||
| func isKnownType(gvk schema.GroupVersionKind, di discovery.CachedDiscoveryInterface) (bool, error) { | |||
| // First try, this may return nil because of the cache | |||
| apiResource, err := getAPIResource(gvk, di) | |||
There was a problem hiding this comment.
I guess, it's a good thing that the discovery client is cached 😉
| // Second try, now with invalidated cache. If we still get nil, we know it's not there. | ||
| log.Printf("Failed to get APIResource for %v, retry with invalidated cache.", gvk) | ||
| di.Invalidate() | ||
| apiResource, err = getAPIResource(gvk, di) |
There was a problem hiding this comment.
Wdyt about making these next few lines a nested known := func(..) method? The same goes for the above isNamespaced/namespaced method.
There was a problem hiding this comment.
Not sure about the inline func, I tried it and it didn't really help much. But you're right that there's a bit of duplication, so I extracted a getUncachedAPIResource
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
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.
What this PR does / why we need it:
For the
DeleteTaskandToggleTaskwe use the enhance process - but this fails when the resource to delete is a custom resource for a CRD which is not installed in the cluster. This is especially problematic for theToggleTaskwhich is often used to guard deployment of features.We need to filter the rendered templates - If one of them is of an unknown type, we shouldn't try to delete it as it can't be there anyway.
This PR splits the convert functionality from the enhancer and skips enhancing for the DeleteTask, then filters the resources for unknown types
Fixes #1547
Signed-off-by: Andreas Neumann aneumann@mesosphere.com