Skip to content

Bug 1880591: Adds missing check for ovs-config-executed #836

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
Oct 27, 2020
Merged

Bug 1880591: Adds missing check for ovs-config-executed #836

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
9 changes: 8 additions & 1 deletion bindata/network/ovn-kubernetes/ovnkube-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ spec:
gateway_mode_flags=
# Check to see if ovs is provided by the node. This is only for upgrade from 4.5->4.6 or
# openshift-sdn to ovn-kube conversion
if grep -q OVNKubernetes /etc/systemd/system/ovs-configuration.service ; then
if grep -q OVNKubernetes /etc/systemd/system/ovs-configuration.service && [ -f /host/var/run/ovs-config-executed ]; then
Copy link
Contributor

@pliurh pliurh Oct 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t think it’ll impact the SDN migration. But I doubt if we really need to check the existence of ovs-config-executed here. Since the ovs-configuration.service will always run before the ovn-kube pods. So I think checking grep -q OVNKubernetes /etc/systemd/system/ovs-configuration.service is sufficient.

gateway_mode_flags="--gateway-mode local --gateway-interface br-ex"
else
gateway_mode_flags="--gateway-mode local --gateway-interface none"
Expand Down Expand Up @@ -862,6 +862,10 @@ spec:
command: ["/bin/bash", "-c", "kill $(cat /var/run/ovn/ovn-nbctl.pid) && unset OVN_NB_DAEMON"]
volumeMounts:
# for checking ovs-configuration service
- mountPath: /host
name: host-slash
readOnly: true
mountPropagation: HostToContainer
- mountPath: /etc/systemd/system
name: systemd-units
readOnly: true
Expand Down Expand Up @@ -958,6 +962,9 @@ spec:
beta.kubernetes.io/os: "linux"
volumes:
# for checking ovs-configuration service
- name: host-slash
hostPath:
path: /
- name: systemd-units
hostPath:
path: /etc/systemd/system
Expand Down