Merge "Add options for Kubernetes Ingress controller"