Skip to content

Commit

Permalink
Merge pull request #1646 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…1623-to-release-4.3

Bug 1824940: The Multus CNI configuration file "00-multus.conf" should not be removed
  • Loading branch information
openshift-merge-robot committed May 13, 2020
2 parents 950242c + 924c001 commit a2645f8
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion templates/common/_base/files/cleanup-cni-conf.yaml
Expand Up @@ -5,6 +5,5 @@ contents:
inline: |
r /etc/kubernetes/cni/net.d/80-openshift-network.conf
r /etc/kubernetes/cni/net.d/10-ovn-kubernetes.conf
r /etc/kubernetes/cni/net.d/00-multus.conf
d /run/multus/cni/net.d/ 0755 root root - -
D /var/lib/cni/networks/openshift-sdn/ 0755 root root - -

0 comments on commit a2645f8

Please sign in to comment.