fix auto_allocate validation message to account for v2 ip auto allocation #52422
Conversation
…roller is enabled and service entry did not opt out Signed-off-by: ilrudie <ian.rudie@solo.io>
istio-testing
added
the
size/S
| @@ -2777,6 +2777,15 @@ var ValidateServiceEntry = RegisterValidateFunc("ValidateServiceEntry", | |||
| } | |||
| } | |||
|
|
|||
| // check for v2 auto IP allocation or opt-out by user | |||
There was a problem hiding this comment.
I'm assuming we have identical logic elsewhere. Can we rely on a util function?
There was a problem hiding this comment.
very good point. such a function does already exist
There was a problem hiding this comment.
ooof, that produces a cyclic import so I'll need to circle back on that
There was a problem hiding this comment.
I moved the location of the helper functions to a new location in order to resolve the cyclic imports. @stevenctl, Can you take a look at if where I landed it is appropriate?
istio-testing
added
size/XS
ilrudie
force-pushed
the
fix-valiation-v2auto-ip
branch
from
6c122a6
to
1b2160f
Compare
istio-testing
added
size/S
pkg/config/validation/validation.go
Outdated
| if features.EnableIPAutoallocate { | ||
| v, ok := cfg.Meta.Labels[constants.EnableV2AutoAllocationLabel] | ||
| if !ok || !strings.EqualFold(v, "false") { | ||
| autoAllocation = true |
There was a problem hiding this comment.
Just to make sure I'm clear on the logic, if EnableV2AutoAllocationLabel label is false, then autoAllocation is true? Why would it not be if EnableV2AutoAllocationLabel label is true, then autoAllocation is true?
There was a problem hiding this comment.
there is a ! before the EqualFold so the logic is labelValue != false.
Generally Steven's comment to re-use the logic used elsewhere probably makes the most sense whenever I have time to resolve the cyclic import issue.
There was a problem hiding this comment.
Oh duh, I overlooked that. Makes sense then. Thank you for clarifying!
Signed-off-by: ilrudie <ian.rudie@solo.io>
ilrudie
added
cherrypick/master
ilrudie
force-pushed
the
fix-valiation-v2auto-ip
branch
from
17a4a05
to
f4c9e43
Compare
Signed-off-by: ilrudie <ian.rudie@solo.io>
ilrudie
force-pushed
the
fix-valiation-v2auto-ip
branch
from
f4c9e43
to
2c63baf
Compare
|
/retest |
|
In response to a cherrypick label: new pull request created: #52460 |
Please provide a description of this PR:
suppress auto_allocate message in validation if auto-allocate ip controller is enabled and service entry did not opt out
fixes #52420