Merge "Update chart to support the deployment without persistent database"