Merge "Add ingress controller support to portal"