-
Notifications
You must be signed in to change notification settings - Fork 127
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
bug 1804913: make ipv6 support a little better #173
Merged
openshift-merge-robot
merged 2 commits into
openshift:master
from
deads2k:sign-for-all-dns-names
Feb 21, 2020
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| package dnshelpers | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "strings" | ||
|
|
||
| configv1 "github.com/openshift/api/config/v1" | ||
|
|
||
| "k8s.io/apimachinery/pkg/util/sets" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
|
|
||
| utilerrors "k8s.io/apimachinery/pkg/util/errors" | ||
|
|
||
| "k8s.io/klog" | ||
| ) | ||
|
|
||
| // GetEscapedPreferredInternalIPAddressForNodeName returns the first internal ip address of the correct family with escaping | ||
| // for ipv6. | ||
| func GetEscapedPreferredInternalIPAddressForNodeName(network *configv1.Network, node *corev1.Node) (string, error) { | ||
| address, family, err := GetPreferredInternalIPAddressForNodeName(network, node) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| if family == "tcp6" { | ||
| return "[" + address + "]", nil | ||
| } else { | ||
| return address, nil | ||
| } | ||
| } | ||
|
|
||
| // GetPreferredInternalIPAddressForNodeName returns the first internal ip address of the correct family and the family | ||
| func GetPreferredInternalIPAddressForNodeName(network *configv1.Network, node *corev1.Node) (string, string, error) { | ||
| ipFamily, err := GetPreferredIPFamily(network) | ||
| if err != nil { | ||
| return "", "", err | ||
| } | ||
|
|
||
| for _, currAddress := range node.Status.Addresses { | ||
| if currAddress.Type == corev1.NodeInternalIP { | ||
| switch ipFamily { | ||
| case "tcp4": | ||
| isIPv4, err := IsIPv4(currAddress.Address) | ||
| if err != nil { | ||
| return "", "", err | ||
| } | ||
| if isIPv4 { | ||
| return currAddress.Address, ipFamily, nil | ||
| } | ||
| case "tcp6": | ||
| isIPv4, err := IsIPv4(currAddress.Address) | ||
| if err != nil { | ||
| return "", "", err | ||
| } | ||
| if !isIPv4 { | ||
| return currAddress.Address, ipFamily, nil | ||
| } | ||
| default: | ||
| return "", "", fmt.Errorf("unexpected ip family: %q", ipFamily) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return "", "", fmt.Errorf("no matches found for ip family %q for node %q", ipFamily, node.Name) | ||
| } | ||
|
|
||
| func GetPreferredIPFamily(network *configv1.Network) (string, error) { | ||
| if len(network.Status.ServiceNetwork) == 0 || len(network.Status.ServiceNetwork[0]) == 0 { | ||
| return "", fmt.Errorf("networks.%s/cluster: status.serviceNetwork not found", configv1.GroupName) | ||
| } | ||
|
|
||
| serviceCIDR := network.Status.ServiceNetwork[0] | ||
| if len(serviceCIDR) == 0 { | ||
| return "", fmt.Errorf("networks.%s/cluster: status.serviceNetwork[0] is empty", configv1.GroupName) | ||
| } | ||
| ip, _, err := net.ParseCIDR(serviceCIDR) | ||
|
|
||
| switch { | ||
| case err != nil: | ||
| return "", err | ||
| case ip.To4() == nil: | ||
| return "tcp6", nil | ||
| default: | ||
| return "tcp4", nil | ||
| } | ||
| } | ||
|
|
||
| func IsIPv4(ipString string) (bool, error) { | ||
| ip := net.ParseIP(ipString) | ||
|
|
||
| switch { | ||
| case ip == nil: | ||
| return false, fmt.Errorf("not an IP") | ||
| case ip.To4() == nil: | ||
| return false, nil | ||
| default: | ||
| return true, nil | ||
| } | ||
| } | ||
|
|
||
| func GetInternalIPAddressesForNodeName(node *corev1.Node) ([]string, error) { | ||
| addresses := []string{} | ||
| for _, currAddress := range node.Status.Addresses { | ||
| if currAddress.Type == corev1.NodeInternalIP { | ||
| addresses = append(addresses, currAddress.Address) | ||
| } | ||
| } | ||
| if len(addresses) == 0 { | ||
| return nil, fmt.Errorf("node/%s missing %s", node.Name, corev1.NodeInternalIP) | ||
| } | ||
|
|
||
| return addresses, nil | ||
| } | ||
|
|
||
| func ReverseLookupFirstHit(discoveryDomain string, ips ...string) (string, error) { | ||
| errs := []error{} | ||
| for _, ip := range ips { | ||
| ret, err := reverseLookupForOneIP(discoveryDomain, ip) | ||
| if err == nil { | ||
| return ret, nil | ||
| } | ||
| errs = append(errs, err) | ||
| } | ||
|
|
||
| if len(errs) == 0 { | ||
| return "", fmt.Errorf("something weird happened for %q, %#v", discoveryDomain, ips) | ||
| } | ||
| return "", utilerrors.NewAggregate(errs) | ||
| } | ||
|
|
||
| func ReverseLookupAllHits(discoveryDomain string, ips ...string) ([]string, error) { | ||
| ret := []string{} | ||
| found := sets.NewString() | ||
| errs := []error{} | ||
| for _, ip := range ips { | ||
| curr, err := reverseLookupForOneIP(discoveryDomain, ip) | ||
| if err != nil { | ||
| errs = append(errs, err) | ||
| } else if !found.Has(curr) { | ||
| ret = append(ret, curr) | ||
| found.Insert(curr) | ||
| } | ||
| } | ||
|
|
||
| switch { | ||
| case len(ret) > 0: | ||
| //ignore errors | ||
| return ret, nil | ||
| case len(errs) == 0: | ||
| // we got no result and no error | ||
| return nil, fmt.Errorf("something weird happened for %q, %#v", discoveryDomain, ips) | ||
| default: | ||
| // we got errors | ||
| return nil, utilerrors.NewAggregate(errs) | ||
| } | ||
| } | ||
| func reverseLookupForOneIP(discoveryDomain, ipAddress string) (string, error) { | ||
| service := "etcd-server-ssl" | ||
| proto := "tcp" | ||
|
|
||
| _, srvs, err := net.LookupSRV(service, proto, discoveryDomain) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| selfTarget := "" | ||
| for _, srv := range srvs { | ||
| klog.V(4).Infof("checking against %s", srv.Target) | ||
| addrs, err := net.LookupHost(srv.Target) | ||
| if err != nil { | ||
| return "", fmt.Errorf("could not resolve member %q", srv.Target) | ||
| } | ||
|
|
||
| for _, addr := range addrs { | ||
| if addr == ipAddress { | ||
| selfTarget = strings.Trim(srv.Target, ".") | ||
| break | ||
| } | ||
| } | ||
| } | ||
| if selfTarget == "" { | ||
| return "", fmt.Errorf("could not find self") | ||
| } | ||
| return selfTarget, nil | ||
| } | ||
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 was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
if an IPv4 address in IPv6 format,
isIPv4will be true, but you will need the brackets.net.IP'sString()will return a canonical IP address string that will match the ipFamily type.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.
node.Status.Addresses should never have IPv4 addresses in IPv6 format (other things will almost definitely break if it does)