K8s 1.6 has affinity/antiaffinity funtionalities as a beta feature. This means we don't need to declare them using annotations. This commit switches usages of affinity to 1.6 syntax. Change-Id: Ia68f4ab28a018617bd44b1295fea58cd30eb4a39
a6cd9bac16