Support for DNS names in egress routes #15409
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| job-id: origin-egress-dns-proxy |
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,23 @@ | ||
| # | ||
| # This is the egress router L4 DNS proxy for OpenShift Origin | ||
| # | ||
| # The standard name for this image is openshift/origin-egress-dns-proxy | ||
|
|
||
| FROM openshift/origin-base | ||
|
|
||
| # HAProxy 1.6+ version is needed to leverage DNS resolution at runtime. | ||
| RUN INSTALL_PKGS="haproxy18 rsyslog" && \ | ||
| yum install -y $INSTALL_PKGS && \ | ||
| rpm -V $INSTALL_PKGS && \ | ||
| yum clean all && \ | ||
| mkdir -p /var/lib/haproxy/{run,log} && \ | ||
| mkdir -p /etc/haproxy && \ | ||
| setcap 'cap_net_bind_service=ep' /usr/sbin/haproxy && \ | ||
| chown -R :0 /var/lib/haproxy && \ | ||
| chmod -R g+w /var/lib/haproxy && \ | ||
| touch /etc/haproxy/haproxy.cfg | ||
|
|
||
| ADD egress-dns-proxy.sh /bin/egress-dns-proxy.sh | ||
|
|
||
| ENTRYPOINT /bin/egress-dns-proxy.sh | ||
|
|
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,178 @@ | ||
| #!/bin/bash | ||
|
|
||
| # OpenShift egress DNS proxy setup script | ||
|
|
||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| # Default DNS nameserver port | ||
| NS_PORT=53 | ||
| CONF=/etc/haproxy/haproxy.cfg | ||
|
|
||
| BLANK_LINE_OR_COMMENT_REGEX="([[:space:]]*$|#.*)" | ||
| IPADDR_REGEX="[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+" | ||
| PORT_REGEX="[[:digit:]]+" | ||
| DOMAINNAME_REGEX="[[:alnum:]][[:alnum:]-]+?\.[[:alnum:].-]+" | ||
|
|
||
| function die() { | ||
| echo "$*" 1>&2 | ||
| exit 1 | ||
| } | ||
|
|
||
| function check_prereqs() { | ||
| if [[ -z "${EGRESS_DNS_PROXY_DESTINATION}" ]]; then | ||
| die "Must specify EGRESS_DNS_PROXY_DESTINATION" | ||
| fi | ||
| } | ||
|
|
||
| function validate_port() { | ||
| local port=$1 | ||
| if [[ "${port}" -lt "1" || "${port}" -gt "65535" ]]; then | ||
| die "Invalid port: ${port}, must be in the range 1 to 65535" | ||
| fi | ||
| } | ||
|
|
||
| function generate_haproxy_defaults() { | ||
| echo " | ||
| global | ||
| log 127.0.0.1 local2 | ||
|
|
||
| chroot /var/lib/haproxy | ||
| pidfile /var/lib/haproxy/run/haproxy.pid | ||
| maxconn 4000 | ||
| user haproxy | ||
| group haproxy | ||
|
|
||
| defaults | ||
| log global | ||
| mode tcp | ||
| option dontlognull | ||
| option tcplog | ||
| option redispatch | ||
| retries 3 | ||
| timeout http-request 100s | ||
| timeout queue 1m | ||
| timeout connect 10s | ||
| timeout client 1m | ||
| timeout server 1m | ||
| timeout http-keep-alive 100s | ||
| timeout check 10s | ||
| " | ||
| } | ||
|
|
||
| function generate_dns_resolvers() { | ||
| echo "resolvers dns-resolver" | ||
|
|
||
| # Fetch nameservers from /etc/resolv.conf | ||
| nameservers=() | ||
| nameservers=$(awk '/^nameserver/ {print $2}' /etc/resolv.conf) | ||
| n=0 | ||
| for ns in ${nameservers[@]}; do | ||
| n=$(($n + 1)) | ||
| echo " nameserver ns$n ${ns}:${NS_PORT}" | ||
| done | ||
|
|
||
| # Set default optional params | ||
| echo " resolve_retries 3" | ||
| echo " timeout retry 1s" | ||
| echo " hold valid 10s" | ||
| echo "" | ||
| } | ||
|
|
||
| function generate_haproxy_frontends_backends() { | ||
| local n=0 | ||
| declare -A used_ports=() | ||
|
|
||
| while read dest; do | ||
| local port target targetport resolvers | ||
|
|
||
| if [[ "${dest}" =~ ^${BLANK_LINE_OR_COMMENT_REGEX}$ ]]; then | ||
| continue | ||
| fi | ||
| n=$(($n + 1)) | ||
| resolvers="" | ||
|
|
||
| if [[ "${dest}" =~ ^${PORT_REGEX}\ +${IPADDR_REGEX}$ ]]; then | ||
| read port target <<< "${dest}" | ||
| targetport="${port}" | ||
| elif [[ "${dest}" =~ ^${PORT_REGEX}\ +${IPADDR_REGEX}\ +${PORT_REGEX}$ ]]; then | ||
| read port target targetport <<< "${dest}" | ||
| elif [[ "${dest}" =~ ^${PORT_REGEX}\ +${DOMAINNAME_REGEX}$ ]]; then | ||
| read port target <<< "${dest}" | ||
| targetport="${port}" | ||
| resolvers="resolvers dns-resolver" | ||
| elif [[ "${dest}" =~ ^${PORT_REGEX}\ +${DOMAINNAME_REGEX}\ +${PORT_REGEX}$ ]]; then | ||
| read port target targetport <<< "${dest}" | ||
| resolvers="resolvers dns-resolver" | ||
| else | ||
| die "Bad destination '${dest}'" | ||
| fi | ||
|
|
||
| validate_port ${port} | ||
| validate_port ${targetport} | ||
|
|
||
| if [[ "${used_ports[${port}]:-}" == "" ]]; then | ||
| used_ports[${port}]=1 | ||
| else | ||
| die "Proxy port $port already used, must be unique for each destination" | ||
| fi | ||
|
|
||
| echo " | ||
| frontend fe$n | ||
| bind :${port} | ||
| default_backend be$n | ||
|
|
||
| backend be$n | ||
| server dest$n ${target}:${targetport} check $resolvers | ||
| " | ||
| done <<< "${EGRESS_DNS_PROXY_DESTINATION}" | ||
| } | ||
|
|
||
| function setup_haproxy_config() { | ||
| generate_haproxy_defaults | ||
| generate_dns_resolvers | ||
| generate_haproxy_frontends_backends | ||
| } | ||
|
|
||
| function setup_haproxy_syslog() { | ||
|
There was a problem hiding this comment. Ugh. There's no way to get it to just log to stdout/stderr? We might want to make it not bother doing this unless the pod spec sets some sort of "debug" variable... There was a problem hiding this comment. By default it is not logging stuff to stdout/stderr, I will enable this stuff when 'debug' variable is set. |
||
| local log_file="/var/lib/haproxy/log/haproxy.log" | ||
|
|
||
| cat >> /etc/rsyslog.conf <<EOF | ||
| module(load="imudp") | ||
| input(type="imudp" port="514") | ||
| EOF | ||
|
|
||
| echo "local2.* ${log_file}" >> /etc/rsyslog.d/haproxy.conf | ||
|
|
||
| /usr/sbin/rsyslogd | ||
| touch "${log_file}" | ||
| tail -f "${log_file}" & | ||
| } | ||
|
|
||
| function run() { | ||
|
|
||
| check_prereqs | ||
|
|
||
| rm -f "${CONF}" | ||
| setup_haproxy_config > "${CONF}" | ||
|
|
||
| if [[ -n "${EGRESS_DNS_PROXY_DEBUG:-}" ]]; then | ||
| setup_haproxy_syslog | ||
| fi | ||
|
|
||
| echo "Running haproxy with config:" | ||
| sed -e 's/^/ /' "${CONF}" | ||
| echo "" | ||
| echo "" | ||
|
|
||
| exec haproxy -f "${CONF}" | ||
| } | ||
|
|
||
| if [[ "${EGRESS_DNS_PROXY_MODE:-}" == "unit-test" ]]; then | ||
| check_prereqs | ||
| setup_haproxy_config | ||
| exit 0 | ||
| fi | ||
|
|
||
| run | ||
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.
will this cause problems if the debug logging isn't enabled?
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.
Tested with and without debug logging and found no issues.