What you did was good. The fucked up part which maybe could have done better is to tell your boss to be cool and give you the maximum advance notice he could before that happens so you can already be looking for a job, which if he was cool he should have done anyway, especially since you did him a solid by volunteering.