Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OPNET-197: Extend logic for detecting Node IP
When generating keepalived.conf we are relying on the logic to gather IPs of all the cluster nodes for the IP stack used by the specific VIP. This logic currently relies only on the addresses reported as part of Node.Status.Addresses. In some scenarios it may be that the node is not reporting all its IPs via kubelet but still have those available. If we detect such a scenario (e.g. kubelet reporting only IPv4, but VIP being IPv6), we will check for Node annotations created by OVN as those use different source of truth so kubelet not reporting IPs is not affecting it. The newly introduced behaviour is just a fallback in case Node.Status.Addresses does not contain an IP of a requested stack, therefore not changing the behaviour for currently working scenarios. Contributes-to: OPNET-197
- Loading branch information
Showing
46 changed files
with
6,467 additions
and
24 deletions.
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| v1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| var ( | ||
| testOvnHostAddressesAnnotation = map[string]string{ | ||
| "k8s.ovn.org/host-addresses": "[\"192.168.1.99\",\"192.168.1.101\",\"2001:db8::49a\",\"fd00::5\",\"fd69::2\"]", | ||
| } | ||
|
|
||
| testNodeDualStack1 = v1.Node{Status: v1.NodeStatus{Addresses: []v1.NodeAddress{ | ||
| {Type: "InternalIP", Address: "192.168.1.99"}, | ||
| {Type: "InternalIP", Address: "fd00::5"}, | ||
| {Type: "ExternalIP", Address: "172.16.1.99"}, | ||
| }}} | ||
| testNodeDualStack2 = v1.Node{ | ||
| Status: v1.NodeStatus{Addresses: []v1.NodeAddress{ | ||
| {Type: "InternalIP", Address: "192.168.1.99"}, | ||
| {Type: "ExternalIP", Address: "172.16.1.99"}, | ||
| }}, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Annotations: testOvnHostAddressesAnnotation, | ||
| }, | ||
| } | ||
| testNodeDualStack3 = v1.Node{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Annotations: testOvnHostAddressesAnnotation, | ||
| }, | ||
| } | ||
| testNodeSingleStackV4 = v1.Node{Status: v1.NodeStatus{Addresses: []v1.NodeAddress{ | ||
| {Type: "InternalIP", Address: "192.168.1.99"}, | ||
| {Type: "ExternalIP", Address: "172.16.1.99"}, | ||
| }}} | ||
| testNodeSingleStackV6 = v1.Node{Status: v1.NodeStatus{Addresses: []v1.NodeAddress{ | ||
| {Type: "InternalIP", Address: "fd00::5"}, | ||
| {Type: "ExternalIP", Address: "2001:db8::49a"}, | ||
| }}} | ||
|
|
||
| testMachineNetworkV4 = "192.168.1.0/24" | ||
| testMachineNetworkV6 = "fd00::5/64" | ||
| testVipV4 = "192.168.1.101" | ||
| testVipV6 = "fd00::101" | ||
| ) | ||
|
|
||
| var _ = Describe("getNodePeersForIpStack", func() { | ||
| Context("for dual-stack node", func() { | ||
| Context("with address only in status", func() { | ||
| It("matches an IPv4 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeDualStack1, testVipV4, testMachineNetworkV4) | ||
| Expect(res).To(Equal("192.168.1.99")) | ||
| }) | ||
| It("matches an IPv6 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeDualStack1, testVipV6, testMachineNetworkV6) | ||
| Expect(res).To(Equal("fd00::5")) | ||
| }) | ||
| }) | ||
|
|
||
| Context("with address only in OVN annotation", func() { | ||
| It("matches an IPv4 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeDualStack3, testVipV4, testMachineNetworkV4) | ||
| Expect(res).To(Equal("192.168.1.99")) | ||
| }) | ||
| It("matches an IPv6 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeDualStack3, testVipV6, testMachineNetworkV6) | ||
| Expect(res).To(Equal("fd00::5")) | ||
| }) | ||
| }) | ||
|
|
||
| Context("with address in status and OVN annotation", func() { | ||
| It("matches an IPv4 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeDualStack2, testVipV4, testMachineNetworkV4) | ||
| Expect(res).To(Equal("192.168.1.99")) | ||
| }) | ||
| It("matches an IPv6 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeDualStack2, testVipV6, testMachineNetworkV6) | ||
| Expect(res).To(Equal("fd00::5")) | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| Context("for single-stack v4 node", func() { | ||
| It("matches an IPv4 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeSingleStackV4, testVipV4, testMachineNetworkV4) | ||
| Expect(res).To(Equal("192.168.1.99")) | ||
| }) | ||
| It("empty for IPv6 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeSingleStackV4, testVipV6, testMachineNetworkV6) | ||
| Expect(res).To(Equal("")) | ||
| }) | ||
| }) | ||
|
|
||
| Context("for single-stack v6 node", func() { | ||
| It("empty for IPv4 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeSingleStackV6, testVipV4, testMachineNetworkV4) | ||
| Expect(res).To(Equal("")) | ||
| }) | ||
| It("matches an IPv6 VIP", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeSingleStackV6, testVipV6, testMachineNetworkV6) | ||
| Expect(res).To(Equal("fd00::5")) | ||
| }) | ||
| }) | ||
|
|
||
| It("empty for empty node", func() { | ||
| res := getNodeIpForRequestedIpStack(v1.Node{}, testVipV4, testMachineNetworkV4) | ||
| Expect(res).To(Equal("")) | ||
| }) | ||
|
|
||
| It("empty for node with IPs and empty VIP requested", func() { | ||
| res := getNodeIpForRequestedIpStack(testNodeSingleStackV4, "", testMachineNetworkV4) | ||
| Expect(res).To(Equal("")) | ||
| }) | ||
| }) | ||
|
|
||
| func Test(t *testing.T) { | ||
| RegisterFailHandler(Fail) | ||
| RunSpecs(t, "Config tests") | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package utils | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "net" | ||
| "strings" | ||
| ) | ||
|
|
||
| func SplitCIDR(s string) (string, string, error) { | ||
| split := strings.Split(s, "/") | ||
| if len(split) != 2 { | ||
| return "", "", fmt.Errorf("not a CIDR") | ||
| } | ||
|
|
||
| return split[0], split[1], nil | ||
| } | ||
|
|
||
| func IsIPv4Addr(ip string) bool { | ||
| return strings.Contains(ip, ".") && net.ParseIP(ip) != nil | ||
| } | ||
|
|
||
| func IsIPv6Addr(ip string) bool { | ||
| return strings.Contains(ip, ":") && net.ParseIP(ip) != nil | ||
| } | ||
|
|
||
| func IpInCidr(ipAddr, cidr string) (bool, error) { | ||
| _, ipNet, err := net.ParseCIDR(cidr) | ||
| if err != nil { | ||
| return false, err | ||
| } | ||
| ip := net.ParseIP(ipAddr) | ||
| if ip == nil { | ||
| return false, errors.New("IP is nil") | ||
| } | ||
| return ipNet.Contains(ip), nil | ||
| } |
Oops, something went wrong.