Merge "Add resources field to all addon charts"