Skip to content
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

update ovs health check, delete connection to ovn sb db #1588

Merged
merged 1 commit into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/templates/monitor-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ spec:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
periodSeconds: 10
timeoutSeconds: 45
livenessProbe:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
initialDelaySeconds: 30
periodSeconds: 10
failureThreshold: 5
Expand Down
4 changes: 2 additions & 2 deletions dist/images/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3016,14 +3016,14 @@ spec:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
periodSeconds: 10
timeoutSeconds: 45
livenessProbe:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
initialDelaySeconds: 30
periodSeconds: 10
failureThreshold: 5
Expand Down
6 changes: 3 additions & 3 deletions dist/images/ovs-healthcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ function gen_conn_str {
echo "$x"
}

echo Connecting OVN SB "$(gen_conn_str 6642)"
# echo Connecting OVN SB "$(gen_conn_str 6642)"
if [[ "$ENABLE_SSL" == "false" ]]; then
ovsdb-client list-dbs "$(gen_conn_str 6642)"
ovsdb-client list-dbs
else
ovsdb-client -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert list-dbs "$(gen_conn_str 6642)"
ovsdb-client -p /var/run/tls/key -c /var/run/tls/cert -C /var/run/tls/cacert list-dbs
fi
alias ovs-ctl='/usr/share/openvswitch/scripts/ovs-ctl'
alias ovn-ctl='/usr/share/ovn/scripts/ovn-ctl'
Expand Down
4 changes: 2 additions & 2 deletions yamls/kube-ovn-dual-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,14 @@ spec:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
periodSeconds: 10
timeoutSeconds: 45
livenessProbe:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
initialDelaySeconds: 30
periodSeconds: 10
failureThreshold: 5
Expand Down
4 changes: 2 additions & 2 deletions yamls/kube-ovn-ipv6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -415,14 +415,14 @@ spec:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
periodSeconds: 10
timeoutSeconds: 45
livenessProbe:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
initialDelaySeconds: 30
periodSeconds: 10
failureThreshold: 5
Expand Down
4 changes: 2 additions & 2 deletions yamls/kube-ovn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -458,14 +458,14 @@ spec:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
periodSeconds: 10
timeoutSeconds: 45
livenessProbe:
exec:
command:
- cat
- /var/run/ovn/ovnnb_db.pid
- /var/run/ovn/ovn-controller.pid
initialDelaySeconds: 30
periodSeconds: 10
failureThreshold: 5
Expand Down