Handle unknown types as unstructured #954
Merged
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
alenkacz
changed the title
|
I'll try to add integration test to confirm this |
alenkacz
changed the title
gerred
approved these changes
Oct 17, 2019
| @@ -52,6 +54,7 @@ func (drm *DynamicRESTMapper) reloadOnError(err error) bool { | |||
| return false | |||
| } | |||
| err = drm.reload() | |||
| fmt.Println("reload") | |||
kensipe
reviewed
Oct 17, 2019
| @@ -23,6 +23,7 @@ import ( | |||
| "github.com/kudobuilder/kudo/pkg/controller/instance" | |||
| "github.com/kudobuilder/kudo/pkg/controller/operator" | |||
| "github.com/kudobuilder/kudo/pkg/controller/operatorversion" | |||
| util "github.com/kudobuilder/kudo/pkg/test/utils" | |||
There was a problem hiding this comment.
- IMO we should not import from the
pkg/testpackages. This could should move out to a common lib location used by kudo and test - it should not be in a
utilspackage. IMO it looks like we have a code intest/utils/which should be in our projectkubeorkubernetespackage.
There was a problem hiding this comment.
we have a number of kube Clients like this in pkg/kubdoctl/kube/config.go
| //ParseKubernetesObjects parses a list of runtime.Objects from the provided yaml | ||
| // ParseKubernetesObjects parses a list of runtime.Objects from the provided yaml | ||
| // If the type is not known in the scheme, it tries to parse it as Unstructured | ||
| // TODO(av) could we use something else than a global scheme here? Should we somehow inject it? | ||
| func ParseKubernetesObjects(yaml string) (objs []runtime.Object, err error) { |
There was a problem hiding this comment.
yaml string seems unnecessarily limiting... wouldn't io.Reader be better?
kensipe
approved these changes
Oct 17, 2019
alenkacz
added a commit
that referenced
this pull request
Oct 18, 2019
**What this PR does / why we need it**: When scheme did not contain that type, we previously failed. Since we should be able to handle all types that people might have installed in their cluster, we should fallback to parsing a type as unstructured when not available. This PR has 3 parts: - update to `ParseKubernetesObjects` to process unknown types as Unstructured - use of dynamic restmapper in execution that ensures that we discover new types that were added during the lifetime of the controller - integration test NOTE: Right now we are using dynamic mapper from test harness. That is probably not as robust as the one introduced in the controller-runtime 0.3.0. I will port this code to the controller-runtime mapper when we bump the version of controller-runtime (that should happen prior to 0.8.0 anyway). Fixes #913
alenkacz
added a commit
that referenced
this pull request
Oct 18, 2019
**What this PR does / why we need it**: When scheme did not contain that type, we previously failed. Since we should be able to handle all types that people might have installed in their cluster, we should fallback to parsing a type as unstructured when not available. This PR has 3 parts: - update to `ParseKubernetesObjects` to process unknown types as Unstructured - use of dynamic restmapper in execution that ensures that we discover new types that were added during the lifetime of the controller - integration test NOTE: Right now we are using dynamic mapper from test harness. That is probably not as robust as the one introduced in the controller-runtime 0.3.0. I will port this code to the controller-runtime mapper when we bump the version of controller-runtime (that should happen prior to 0.8.0 anyway). Fixes #913
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:
When scheme did not contain that type, we previously failed. Since we should be able to handle all types that people might have installed in their cluster, we should fallback to parsing a type as unstructured when not available.
This PR has 3 parts:
ParseKubernetesObjectsto process unknown types as UnstructuredNOTE: Right now we are using dynamic mapper from test harness. That is probably not as robust as the one introduced in the controller-runtime 0.3.0. I will port this code to the controller-runtime mapper when we bump the version of controller-runtime (that should happen prior to 0.8.0 anyway).
Fixes #913