Merge pull request #64 from danwinship/egress-cidrs

add HostSubnet.EgressCIDRs
openshift · Jul 18, 2018 · da58561 · da58561
2 parents 331c73c + d4dd70e
commit da58561
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 65 deletions.
diff --git a/network/v1/generated.pb.go b/network/v1/generated.pb.go
diff --git a/network/v1/generated.proto b/network/v1/generated.proto
diff --git a/network/v1/types.go b/network/v1/types.go
@@ -69,9 +69,16 @@ type HostSubnet struct {
 	// Subnet is the CIDR range of the overlay network assigned to the node for its pods
 	Subnet string `json:"subnet" protobuf:"bytes,4,opt,name=subnet"`
 
-	// EgressIPs is the list of automatic egress IP addresses currently hosted by this node
+	// EgressIPs is the list of automatic egress IP addresses currently hosted by this node.
+	// If EgressCIDRs is empty, this can be set by hand; if EgressCIDRs is set then the
+	// master will overwrite the value here with its own allocation of egress IPs.
 	// +optional
 	EgressIPs []string `json:"egressIPs,omitempty" protobuf:"bytes,5,rep,name=egressIPs"`
+	// EgressCIDRs is the list of CIDR ranges available for automatically assigning
+	// egress IPs to this node from. If this field is set then EgressIPs should be
+	// treated as read-only.
+	// +optional
+	EgressCIDRs []string `json:"egressCIDRs,omitempty" protobuf:"bytes,6,rep,name=egressCIDRs"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/network/v1/types_swagger_doc_generated.go b/network/v1/types_swagger_doc_generated.go
diff --git a/network/v1/zz_generated.deepcopy.go b/network/v1/zz_generated.deepcopy.go