Skip to content

Commit

Permalink
pinger: use fully qualified domain name (#3032)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangzujian authored Jul 12, 2023
1 parent f3833f9 commit 9d88e49
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,23 @@ ipv4:
SVC_CIDR: "10.96.0.0/12"
JOIN_CIDR: "100.64.0.0/16"
PINGER_EXTERNAL_ADDRESS: "114.114.114.114"
PINGER_EXTERNAL_DOMAIN: "alauda.cn"
PINGER_EXTERNAL_DOMAIN: "alauda.cn."

ipv6:
POD_CIDR: "fd00:10:16::/112"
POD_GATEWAY: "fd00:10:16::1"
SVC_CIDR: "fd00:10:96::/112"
JOIN_CIDR: "fd00:100:64::/112"
PINGER_EXTERNAL_ADDRESS: "2400:3200::1"
PINGER_EXTERNAL_DOMAIN: "google.com"
PINGER_EXTERNAL_DOMAIN: "google.com."

dual_stack:
POD_CIDR: "10.16.0.0/16,fd00:10:16::/112"
POD_GATEWAY: "10.16.0.1,fd00:10:16::1"
SVC_CIDR: "10.96.0.0/12,fd00:10:96::/112"
JOIN_CIDR: "100.64.0.0/16,fd00:100:64::/112"
PINGER_EXTERNAL_ADDRESS: "114.114.114.114,2400:3200::1"
PINGER_EXTERNAL_DOMAIN: "google.com"
PINGER_EXTERNAL_DOMAIN: "google.com."

performance:
MODULES: "kube_ovn_fastpath.ko"
Expand Down
6 changes: 3 additions & 3 deletions dist/images/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,23 @@ POD_GATEWAY="10.16.0.1"
SVC_CIDR="10.96.0.0/12" # Do NOT overlap with NODE/POD/JOIN CIDR
JOIN_CIDR="100.64.0.0/16" # Do NOT overlap with NODE/POD/SVC CIDR
PINGER_EXTERNAL_ADDRESS="114.114.114.114" # Pinger check external ip probe
PINGER_EXTERNAL_DOMAIN="alauda.cn" # Pinger check external domain probe
PINGER_EXTERNAL_DOMAIN="alauda.cn." # Pinger check external domain probe
SVC_YAML_IPFAMILYPOLICY=""
if [ "$IPV6" = "true" ]; then
POD_CIDR="fd00:10:16::/112" # Do NOT overlap with NODE/SVC/JOIN CIDR
POD_GATEWAY="fd00:10:16::1"
SVC_CIDR="fd00:10:96::/112" # Do NOT overlap with NODE/POD/JOIN CIDR
JOIN_CIDR="fd00:100:64::/112" # Do NOT overlap with NODE/POD/SVC CIDR
PINGER_EXTERNAL_ADDRESS="2400:3200::1"
PINGER_EXTERNAL_DOMAIN="google.com"
PINGER_EXTERNAL_DOMAIN="google.com."
fi
if [ "$DUAL_STACK" = "true" ]; then
POD_CIDR="10.16.0.0/16,fd00:10:16::/112" # Do NOT overlap with NODE/SVC/JOIN CIDR
POD_GATEWAY="10.16.0.1,fd00:10:16::1"
SVC_CIDR="10.96.0.0/12,fd00:10:96::/112" # Do NOT overlap with NODE/POD/JOIN CIDR
JOIN_CIDR="100.64.0.0/16,fd00:100:64::/112" # Do NOT overlap with NODE/POD/SVC CIDR
PINGER_EXTERNAL_ADDRESS="114.114.114.114,2400:3200::1"
PINGER_EXTERNAL_DOMAIN="google.com"
PINGER_EXTERNAL_DOMAIN="google.com."
SVC_YAML_IPFAMILYPOLICY="ipFamilyPolicy: PreferDualStack"
fi

Expand Down
2 changes: 1 addition & 1 deletion yamls/kube-ovn-dual-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ spec:
- /kube-ovn/kube-ovn-pinger
args:
- --external-address=114.114.114.114,2400:3200::1
- --external-dns=alauda.cn
- --external-dns=google.com.
- --logtostderr=false
- --alsologtostderr=true
- --log_file=/var/log/kube-ovn/kube-ovn-pinger.log
Expand Down
2 changes: 1 addition & 1 deletion yamls/kube-ovn-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ spec:
- /kube-ovn/kube-ovn-pinger
args:
- --external-address=2400:3200::1
- --external-dns=alauda.cn
- --external-dns=google.com.
- --logtostderr=false
- --alsologtostderr=true
- --log_file=/var/log/kube-ovn/kube-ovn-pinger.log
Expand Down
2 changes: 1 addition & 1 deletion yamls/kube-ovn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ spec:
- /kube-ovn/kube-ovn-pinger
args:
- --external-address=114.114.114.114
- --external-dns=alauda.cn
- --external-dns=alauda.cn.
- --logtostderr=false
- --alsologtostderr=true
- --log_file=/var/log/kube-ovn/kube-ovn-pinger.log
Expand Down

0 comments on commit 9d88e49

Please sign in to comment.