Merge "Add service in kubernetes context"