Merge "Fix kubernetes autodiscovery"