shixiong/okd @ 5155ab9bb8bc0bec530cf52b0fbd00c6f1684be2

OpenShift Merge Robot 3adc99bb68 Merge pull request #8309 from dulek/kuryr-cni-plugins		%!s(int64=7) %!d(string=hai) anos
..
cni-daemonset.yaml.j2	8031c14a26 Kuryr: Copy CNI plugins as DaemonSet initContainer	%!s(int64=7) %!d(string=hai) anos
configmap.yaml.j2	6fb2d0fa0e Switch from public subnet id to network id at kuryr	%!s(int64=7) %!d(string=hai) anos
controller-deployment.yaml.j2	d540ffb468 Make Kuryr healthchecks probes optional	%!s(int64=7) %!d(string=hai) anos