OpenShift Merge Robot 2684ff3c5f Merge pull request #6962 from esevan/kuryr-cni-conf %!s(int64=7) %!d(string=hai) anos
..
cni-daemonset.yaml.j2 ad86fe88c3 kuryr: Make controller and CNI image configurable %!s(int64=7) %!d(string=hai) anos
configmap.yaml.j2 2684ff3c5f Merge pull request #6962 from esevan/kuryr-cni-conf %!s(int64=7) %!d(string=hai) anos
controller-deployment.yaml.j2 ad86fe88c3 kuryr: Make controller and CNI image configurable %!s(int64=7) %!d(string=hai) anos