Merge "Fix nodeSlector and Affinity for aai charts"