Merge "Fix kubernetes config matrices"