Merge "Add correct condition to support calico, oc32 and oc40 in kubelet"