Merge "Revert "Revert "Add k8s-ha-calico model support"""