shixiong/okd @ 7c0d3575c10d6425612b3c7d10b8da4c62938de2

Michael Gugino 0fc45b607e Merge pull request #6062 from luis5tb/readiness		%!s(int64=7) %!d(string=hai) anos
..
cni-daemonset.yaml.j2	e6ea6839a8 Initial Kuryr support	%!s(int64=7) %!d(string=hai) anos
configmap.yaml.j2	b9279094ba Add external_svc_subnet for k8s loadbalancer type service	%!s(int64=7) %!d(string=hai) anos
controller-deployment.yaml.j2	af74b50d3a Add readiness probe to kuryr controller pod	%!s(int64=7) %!d(string=hai) anos