-
Notifications
You must be signed in to change notification settings - Fork 526
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add HostSubnet.EgressCIDRs #64
Conversation
/assign @smarterclayton |
network/v1/types.go
Outdated
@@ -72,6 +72,11 @@ type HostSubnet struct { | |||
// EgressIPs is the list of automatic egress IP addresses currently hosted by this node | |||
// +optional | |||
EgressIPs []string `json:"egressIPs,omitempty" protobuf:"bytes,5,rep,name=egressIPs"` | |||
// EgressCIDRs is the list of CIDR ranges available for automatically assigning |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is this going to be used? Set by the controller or by the node?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Set by the controller
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why egressIPs would be read only? Is it because the controller will populate egressIPs automatically?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. For backward-compatibility we have to continue letting people manually assign egress IPs (by setting EgressIPs
while leaving EgressCIDRs
unset). But if they are setting EgressCIDRs
, then they can't also set EgressIPs
themselves, because the controller will just end up overwriting it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add that to the godoc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
(The origin PR is ready-ish to merge once this does. It hasn't managed to pass integration or cmd yet, but that's just flakes) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@smarterclayton @deads2k -- Can this go in when openshift/origin#20258 passes tests? |
44d02c2
to
30297c1
Compare
@smarterclayton ok, this is green and the origin PR is green except for /approve |
@smarterclayton @deads2k -- What's the status on this? Can it go in? |
The corresponding PR has passed all tests and is just waiting for API approval. |
/approve |
/lgtm |
Update CSV WebhookDescription struct
Allow admins to specify CIDR ranges to automatically assign EgressIPs out of.
(We had talked before about implementing this as an annotation on Node, but it simplifies things to have it on HostSubnet instead, and the future solution with OVN will probably involve CRDs anyway, so there's no reason to use Node now.)
@openshift/sig-networking PTAL