Merge "[CDS] Fix Ingress configuration"