No need to add two "containers" section for one pod

Fix issue #2664
Merge pull request #2677 from jay-lau/master

No need to add two "containers" section for one pod