CEL validation: implement validateProvider for EnvoyProxy #2081
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: zirain <zirain2009@gmail.com>
Signed-off-by: zirain <zirain2009@gmail.com>
Codecov Report
@@ Coverage Diff @@
## main #2081 +/- ##
==========================================
- Coverage 64.56% 64.48% -0.08%
==========================================
Files 109 109
Lines 15049 15049
==========================================
- Hits 9716 9705 -11
- Misses 4735 4742 +7
- Partials 598 602 +4
|
arkodg
reviewed
Oct 26, 2023
Signed-off-by: zirain <zirain2009@gmail.com>
zirain
commented
Oct 26, 2023
| @@ -122,6 +122,9 @@ type EnvoyProxyKubernetesProvider struct { | |||
| // are applied. | |||
| // | |||
| // +optional | |||
| // +kubebuilder:validation:XValidation:message="allocateLoadBalancerNodePorts can only be set for LoadBalancer type",rule="!has(self.allocateLoadBalancerNodePorts) || self.type == 'LoadBalancer'" | |||
| // +kubebuilder:validation:XValidation:message="loadBalancerIP can only be set for LoadBalancer type",rule="!has(self.loadBalancerIP) || self.type == 'LoadBalancer'" | |||
| // +kubebuilder:validation:XValidation:message="loadBalancerIP must be a valid IPv4 address",rule="!has(self.loadBalancerIP) || self.loadBalancerIP.matches(r\"^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\\.|$)){4})\")" | |||
There was a problem hiding this comment.
this's hard to read, but I cannot find better solution right now.
Hope one day, there's ip lib from kubernetest just like url.
There was a problem hiding this comment.
Unfortunately, this is just kind of the nature of CEL for more complex logic.
|
/retest |
Alice-Lilith
previously approved these changes
Oct 27, 2023
| @@ -122,6 +122,9 @@ type EnvoyProxyKubernetesProvider struct { | |||
| // are applied. | |||
| // | |||
| // +optional | |||
| // +kubebuilder:validation:XValidation:message="allocateLoadBalancerNodePorts can only be set for LoadBalancer type",rule="!has(self.allocateLoadBalancerNodePorts) || self.type == 'LoadBalancer'" | |||
| // +kubebuilder:validation:XValidation:message="loadBalancerIP can only be set for LoadBalancer type",rule="!has(self.loadBalancerIP) || self.type == 'LoadBalancer'" | |||
| // +kubebuilder:validation:XValidation:message="loadBalancerIP must be a valid IPv4 address",rule="!has(self.loadBalancerIP) || self.loadBalancerIP.matches(r\"^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\\.|$)){4})\")" | |||
There was a problem hiding this comment.
Unfortunately, this is just kind of the nature of CEL for more complex logic.
arkodg
reviewed
Oct 27, 2023
| @@ -3,10 +3,10 @@ | |||
| // The full text of the Apache license is available in the LICENSE file at | |||
| // the root of the repo. | |||
|
|
|||
| //go:build validation | |||
There was a problem hiding this comment.
can we rename file to
test/cel/envoyproxy_test.go
and the tag can be celvalidation
arkodg
reviewed
Oct 27, 2023
Signed-off-by: zirain <zirain2009@gmail.com>
arkodg
reviewed
Oct 27, 2023
Signed-off-by: zirain <zirain2009@gmail.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.
No description provided.