Skip to content

proxy: filter/delegate EndpointSlices as well as Endpoints #296

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 17 commits into from
Jul 21, 2021
Merged

proxy: filter/delegate EndpointSlices as well as Endpoints #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
19c04c7
OsdnProxy: add unit test
danwinship Apr 24, 2021
e69945a
OsdnProxy: minor fix to "endpoints become blocked" case
danwinship Apr 25, 2021
18e2a8b
OsdnProxy: remove some dead code
danwinship Apr 25, 2021
b088d18
OsdnProxy: clarify (and slightly fix) locking semantics
danwinship May 4, 2021
ace5c69
HybridProxier: move to pkg/network/proxy, add unit test
danwinship Apr 24, 2021
b7ec8b7
HybridProxier: move setup into OsdnProxy, update tests to use both
danwinship Apr 25, 2021
5b64a5a
HybridProxier: logging cleanup/consistency
danwinship Jun 18, 2021
fefb0c7
HybridProxier: minor cleanups
danwinship May 14, 2021
5e7138a
common: abstract "cluster network contains" code
danwinship May 31, 2020
25dde83
OsdnProxy: reorganize data to be per-Namespace
danwinship Apr 24, 2021
0b07e6d
OsdnProxy: don't cache Endpoints we won't need later
danwinship Apr 24, 2021
e259a69
HybridProxier: pass all Endpoints events to the main proxy
danwinship Apr 28, 2021
637c6c0
HybridProxier: simplify service/endpoint tracking
danwinship May 14, 2021
1ef7da2
HybridProxier: simplify proxy switching
danwinship May 14, 2021
8ac33d8
HybridProxier: update to idle based on Service annotation
danwinship May 14, 2021
7c3ddc2
HybridProxier: don't pass irrelevant Endpoints to unidling proxy
danwinship May 15, 2021
8c452cf
proxy: port to EndpointSlice
danwinship Apr 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions pkg/network/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,26 @@ func ParseClusterNetwork(cn *networkv1.ClusterNetwork) (*ParsedClusterNetwork, e
return pcn, nil
}

// PodNetworkContains determines whether pcn's pod network contains ip
func (pcn *ParsedClusterNetwork) PodNetworkContains(ip net.IP) bool {
for _, cn := range pcn.ClusterNetworks {
if cn.ClusterCIDR.Contains(ip) {
return true
}
}
return false
}

// ServiceNetworkContains determines whether pcn's service network contains ip
func (pcn *ParsedClusterNetwork) ServiceNetworkContains(ip net.IP) bool {
if pcn.ServiceNetwork != nil {
if pcn.ServiceNetwork.Contains(ip) {
return true
}
}
return false
}

func (pcn *ParsedClusterNetwork) ValidateNodeIP(nodeIP string) error {
if nodeIP == "" || nodeIP == "127.0.0.1" {
return fmt.Errorf("invalid node IP %q", nodeIP)
Expand Down Expand Up @@ -132,7 +152,7 @@ func (pcn *ParsedClusterNetwork) CheckClusterObjects(subnets []networkv1.HostSub
subnetIP, _, _ := net.ParseCIDR(subnet.Subnet)
if subnetIP == nil {
errList = append(errList, fmt.Errorf("failed to parse network address: %s", subnet.Subnet))
} else if _, contains := ClusterNetworkListContains(pcn.ClusterNetworks, subnetIP); !contains {
} else if !pcn.PodNetworkContains(subnetIP) {
errList = append(errList, fmt.Errorf("existing node subnet: %s is not part of any cluster network CIDR", subnet.Subnet))
}
if len(errList) >= 10 {
Expand All @@ -143,7 +163,11 @@ func (pcn *ParsedClusterNetwork) CheckClusterObjects(subnets []networkv1.HostSub
if pod.Spec.HostNetwork {
continue
}
if _, contains := ClusterNetworkListContains(pcn.ClusterNetworks, net.ParseIP(pod.Status.PodIP)); !contains && pod.Status.PodIP != "" {
podIP := net.ParseIP(pod.Status.PodIP)
if podIP == nil {
continue
}
if !pcn.PodNetworkContains(podIP) {
errList = append(errList, fmt.Errorf("existing pod %s:%s with IP %s is not part of cluster network", pod.Namespace, pod.Name, pod.Status.PodIP))
if len(errList) >= 10 {
break
Expand All @@ -152,7 +176,10 @@ func (pcn *ParsedClusterNetwork) CheckClusterObjects(subnets []networkv1.HostSub
}
for _, svc := range services {
svcIP := net.ParseIP(svc.Spec.ClusterIP)
if svcIP != nil && !pcn.ServiceNetwork.Contains(svcIP) {
if svcIP == nil {
continue
}
if !pcn.ServiceNetworkContains(svcIP) {
errList = append(errList, fmt.Errorf("existing service %s:%s with IP %s is not part of service network %s", svc.Namespace, svc.Name, svc.Spec.ClusterIP, pcn.ServiceNetwork.String()))
if len(errList) >= 10 {
break
Expand Down
Loading