config: add additional dns lookup families, default to V4_PREFERRED (#3957)

This commit is contained in:
Caleb Doxsey 2023-02-10 16:29:23 -07:00 committed by GitHub
parent e66c26c9ad
commit b50d5f3203
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 12 deletions

View file

@ -11,18 +11,31 @@ import (
// DNSLookupFamily values.
const (
DNSLookupFamilyAuto = "AUTO"
DNSLookupFamilyV4Only = "V4_ONLY"
DNSLookupFamilyV6Only = "V6_ONLY"
DNSLookupFamilyAuto = "AUTO"
DNSLookupFamilyV4Only = "V4_ONLY"
DNSLookupFamilyV6Only = "V6_ONLY"
DNSLookupFamilyV4Preferred = "V4_PREFERRED"
DNSLookupFamilyAll = "ALL"
)
// AllDNSLookupFamilies are all the available DNSLookupFamily values.
var AllDNSLookupFamilies = []string{DNSLookupFamilyV6Only, DNSLookupFamilyV4Only, DNSLookupFamilyAuto}
var AllDNSLookupFamilies = []string{
DNSLookupFamilyAuto,
DNSLookupFamilyV4Only,
DNSLookupFamilyV6Only,
DNSLookupFamilyV4Preferred,
DNSLookupFamilyAll,
}
// ValidateDNSLookupFamily validates the value to confirm its one of the available DNS lookup families.
func ValidateDNSLookupFamily(value string) error {
switch value {
case "", DNSLookupFamilyAuto, DNSLookupFamilyV4Only, DNSLookupFamilyV6Only:
case "",
DNSLookupFamilyAuto,
DNSLookupFamilyV4Only,
DNSLookupFamilyV6Only,
DNSLookupFamilyV4Preferred,
DNSLookupFamilyAll:
return nil
}
@ -32,12 +45,20 @@ func ValidateDNSLookupFamily(value string) error {
// GetEnvoyDNSLookupFamily gets the envoy DNS lookup family.
func GetEnvoyDNSLookupFamily(value string) envoy_config_cluster_v3.Cluster_DnsLookupFamily {
switch value {
case DNSLookupFamilyAuto:
return envoy_config_cluster_v3.Cluster_AUTO
case DNSLookupFamilyV4Only:
return envoy_config_cluster_v3.Cluster_V4_ONLY
case DNSLookupFamilyV6Only:
return envoy_config_cluster_v3.Cluster_V6_ONLY
case DNSLookupFamilyV4Preferred:
return envoy_config_cluster_v3.Cluster_V4_PREFERRED
case DNSLookupFamilyAll:
return envoy_config_cluster_v3.Cluster_ALL
}
return envoy_config_cluster_v3.Cluster_AUTO
// default
return envoy_config_cluster_v3.Cluster_V4_PREFERRED
}
// ValidateMetricsAddress validates address for the metrics