#### What type of PR is this?
<!--
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
-->
We should be using replica to indicate a new node of redis.
Unfortunatley gcr still hasn't pushed another image, so we will still
have to use registry.k8s.io/redis-slave:v2
#### What this PR does / why we need it:
N/A
#### Which issue(s) this PR fixes:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #
N/A
#### Special notes for your reviewer:
N/A
Signed-off-by: Charlie Drage <charlie@charliedrage.com>
* Copy the service labels also to Deployment Pod spec annotations
This allows kube2iam to work
* Remove test file forgotten from version 1.0.0
* Update test fixtures to have Deployment.spec.t.m.annotations
* Fix name conversion "test_server" -> "test-server"
It looks unrelated to my changes, but still changing.
* Fixing some more output fixtures
Previously we used to mention controller type as `--deployment`,
`--replication-controller` or `--daemonset` as argument.
But now,
it will be like,
ex.
```
kompose convert --controller=daemonset
```
