Rewrite the cluster validation to be an actual validator