Do not validate CIS on cluster from template #26887
Merged
Conversation
This file contains hidden or 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
luthermonson
approved these changes
May 1, 2020
kinarashah
reviewed
May 1, 2020
| var clientClusterSpec mgmtclient.Cluster | ||
| logrus.Tracef("Validator: data: %+v\n", data) | ||
| if err := convert.ToObj(data, &clusterSpec); err != nil { | ||
| return httperror.WrapAPIError(err, httperror.InvalidBodyContent, "Cluster spec conversion error") |
There was a problem hiding this comment.
nit: we'd need different err msg for client and cluster spec
There was a problem hiding this comment.
Agreed here, error needs to be updated.
kinarashah
approved these changes
May 1, 2020
dramich
reviewed
May 4, 2020
| return httperror.WrapAPIError(err, httperror.InvalidBodyContent, "Cluster spec conversion error") | ||
| } | ||
|
|
||
| logrus.Tracef("Validator: clusterSpec: %+v\n", &clusterSpec) |
There was a problem hiding this comment.
We can't log this, it can/will have creds in it. Logging entire objects even in trace is not safe.
dramich
reviewed
May 4, 2020
| var spec v3.ClusterSpec | ||
| var clusterSpec v3.ClusterSpec | ||
| var clientClusterSpec mgmtclient.Cluster | ||
| logrus.Tracef("Validator: data: %+v\n", data) |
uhhc
pushed a commit
to uhhc/rancher
that referenced
this pull request
Sep 29, 2020
…ncheck Do not validate CIS on cluster from template
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.
#26616
We got a panic when a cluster was validated that was created from a cluster template as it does not contain version information when posted to the API. The initial thought was to check for
spec.RancherKubernetesEngineConfigbeing nil but there is a field when a cluster template is used (ClusterTemplateRevisionID) but this wasn't available in the type that was used (v3.ClusterSpec) but is available inmgmtclient.Clusterwhich is also used for the functionvalidateEnforcement. So I changed the type and used that, only thing I ran into is that the field for ProfileType are strings in the other type so I have to cast them.