Merge "[RIC-434] Update custom configmaps and e2t nodeport"