Merge "Revert "Bump k8s to 1.8.8-6""