Skip to content

Adds missing OVN NB SSL args to ovnkube master #572

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 7, 2020
Merged

Adds missing OVN NB SSL args to ovnkube master #572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions bindata/network/ovn-kubernetes/ovnkube-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,14 @@ spec:
fi

# start nbctl daemon for caching
export OVN_NB_DAEMON=$(ovn-nbctl --pidfile=/tmp/ovnk-nbctl.pid \
export OVN_NB_DAEMON=$(ovn-nbctl --pidfile=/var/run/ovn/ovn-nbctl.pid \
--detach \
-p /ovn-cert/tls.key -c /ovn-cert/tls.crt -C /ovn-ca/ca-bundle.crt \
--db "{{.OVN_NB_DB_LIST}}")

# REMOVEME once OVN path for control socket is fixed (right now uses /var/run/openvswitch)
ln -sf $OVN_NB_DAEMON /var/run/ovn/

exec /usr/bin/ovnkube \
--init-master "${K8S_NODE}" \
--config-file=/run/ovnkube-config/ovnkube.conf \
Expand All @@ -346,11 +349,16 @@ spec:
--sb-address "{{.OVN_SB_ADDR_LIST}}" \
--sb-client-privkey /ovn-cert/tls.key \
--sb-client-cert /ovn-cert/tls.crt \
--sb-client-cacert /ovn-ca/ca-bundle.crt
--sb-client-cacert /ovn-ca/ca-bundle.crt \
--nb-address "{{.OVN_NB_ADDR_LIST}}" \
--nb-client-privkey /ovn-cert/tls.key \
--nb-client-cert /ovn-cert/tls.crt \
--nb-client-cacert /ovn-ca/ca-bundle.crt \
--nbctl-daemon-mode true
lifecycle:
preStop:
exec:
command: ["/bin/bash", "-c", "kill $(cat /tmp/ovnk-nbctl.pid) && unset OVN_NB_DAEMON"]
command: ["/bin/bash", "-c", "kill $(cat /var/run/ovn/ovn-nbctl.pid) && unset OVN_NB_DAEMON"]
volumeMounts:
- mountPath: /etc/openvswitch/
name: etc-openvswitch
Expand Down