From 862f5c8e58072fdb09f7e8de37278a27b0df7a4f Mon Sep 17 00:00:00 2001
From: Michael Goodness <mgoodness@widen.com>
Date: Wed, 2 Nov 2016 13:22:36 -0500
Subject: [PATCH] Use `name` template for container

---
 stable/spartakus/README.md                 | 3 +--
 stable/spartakus/templates/deployment.yaml | 4 ++--
 stable/spartakus/values.yaml               | 7 +------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/stable/spartakus/README.md b/stable/spartakus/README.md
index 4517bd3113..7f13788703 100644
--- a/stable/spartakus/README.md
+++ b/stable/spartakus/README.md
@@ -44,8 +44,7 @@ The following tables lists the configurable parameters of the Spartakus chart an
 
 | Parameter                            | Description                              | Default                                                    |
 | -------------------------------      | -------------------------------          | ---------------------------------------------------------- |
-| `containerImage`                              | Container image                          | `gcr.io/google_containers/spartakus-amd64:{VERSION}`                              |
-| `containerName`                              | Container name                          | `spartakus`                              |
+| `image`                              | Container image                          | `gcr.io/google_containers/spartakus-amd64:{VERSION}`                              |
 | `imagePullPolicy`                    | Image pull policy                        | `Always` if `image` tag is `latest`, else `IfNotPresent`   |
 | `resources.requests.cpu`            | CPU resource request    | `2m`                                                      |
 | `resources.requests.memory` | Memory resource request   | `8Mi`                                                  |
diff --git a/stable/spartakus/templates/deployment.yaml b/stable/spartakus/templates/deployment.yaml
index e82d5755c0..d382990512 100644
--- a/stable/spartakus/templates/deployment.yaml
+++ b/stable/spartakus/templates/deployment.yaml
@@ -16,8 +16,8 @@ spec:
         release: "{{ .Release.Name }}"
     spec:
       containers:
-        - name: {{ default "spartakus" .Values.containerName | quote }}
-          image: "{{ .Values.containerImage }}"
+        - name: {{ template "name" . }}
+          image: "{{ .Values.image }}"
           imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
           args:
             - volunteer
diff --git a/stable/spartakus/values.yaml b/stable/spartakus/values.yaml
index cb73618c5d..beb2213830 100644
--- a/stable/spartakus/values.yaml
+++ b/stable/spartakus/values.yaml
@@ -1,11 +1,6 @@
 ## Container image
 ##
-containerImage: gcr.io/google_containers/spartakus-amd64:v1.0.0
-
-## Container name
-## Default: 'spartakus'
-##
-## containerName:
+image: gcr.io/google_containers/spartakus-amd64:v1.0.0
 
 ## imagePullPolicy
 ## Default: 'Always' if image tag is 'latest', else 'IfNotPresent'