From d3dea2df29f753e10fdac8646e49eea76afef9ad Mon Sep 17 00:00:00 2001
From: Max Williams <max.williams@deliveryhero.com>
Date: Fri, 1 Feb 2019 20:22:48 +0100
Subject: [PATCH] [stable/drone] bump version to rc5, simplify container names
 (#11054)

* [stable/drone] bump version to rc5, simplify container names

Signed-off-by: Max Williams <max.williams@deliveryhero.com>

* revert this, it was a local change

Signed-off-by: Max Williams <max.williams@deliveryhero.com>
---
 stable/drone/Chart.yaml                       | 4 ++--
 stable/drone/templates/deployment-agent.yaml  | 4 ++--
 stable/drone/templates/deployment-server.yaml | 2 +-
 stable/drone/values.yaml                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml
index 229aaa3bbd..60e0c05b4d 100644
--- a/stable/drone/Chart.yaml
+++ b/stable/drone/Chart.yaml
@@ -1,8 +1,8 @@
 name: drone
 home: https://drone.io/
 icon: https://drone.io/apple-touch-icon.png
-version: 2.0.0-rc.6
-appVersion: 1.0.0-rc.4
+version: 2.0.0-rc.7
+appVersion: 1.0.0-rc.5
 description: Drone is a Continuous Delivery system built on container technology
 keywords:
 - continuous-delivery
diff --git a/stable/drone/templates/deployment-agent.yaml b/stable/drone/templates/deployment-agent.yaml
index 135b694156..b7530abbc8 100644
--- a/stable/drone/templates/deployment-agent.yaml
+++ b/stable/drone/templates/deployment-agent.yaml
@@ -36,7 +36,7 @@ spec:
 {{- end }}
       serviceAccountName: {{ template "drone.serviceAccountName" . }}
       containers:
-      - name: {{ template "drone.fullname" . }}-agent
+      - name: agent
         image: "{{ .Values.images.agent.repository }}:{{ .Values.images.agent.tag }}"
         imagePullPolicy: {{ .Values.images.agent.pullPolicy }}
         ports:
@@ -72,7 +72,7 @@ spec:
           hostPath:
             path: /var/run/docker.sock
 {{- else }}
-      - name: {{ template "drone.fullname" . }}-dind
+      - name: dind
         image: "{{ .Values.images.dind.repository }}:{{ .Values.images.dind.tag }}"
         imagePullPolicy: {{ .Values.images.dind.pullPolicy }}
 {{- if .Values.dind.command }}
diff --git a/stable/drone/templates/deployment-server.yaml b/stable/drone/templates/deployment-server.yaml
index dfe7459789..a6ffdf1db8 100644
--- a/stable/drone/templates/deployment-server.yaml
+++ b/stable/drone/templates/deployment-server.yaml
@@ -40,7 +40,7 @@ spec:
 {{- end }}
       serviceAccountName: {{ template "drone.serviceAccountName" . }}
       containers:
-      - name: {{ template "drone.fullname" . }}-server
+      - name: server
         image: "{{ .Values.images.server.repository }}:{{ .Values.images.server.tag }}"
         imagePullPolicy: {{ .Values.images.server.pullPolicy }}
         env:
diff --git a/stable/drone/values.yaml b/stable/drone/values.yaml
index aafb2e5aa4..124b262146 100644
--- a/stable/drone/values.yaml
+++ b/stable/drone/values.yaml
@@ -4,7 +4,7 @@ images:
   ##
   server:
     repository: "docker.io/drone/drone"
-    tag: 1.0.0-rc.4
+    tag: 1.0.0-rc.5
     pullPolicy: IfNotPresent
 
   ## The official drone (agent) image, change tag to use a different version.
@@ -12,7 +12,7 @@ images:
   ##
   agent:
     repository: "docker.io/drone/agent"
-    tag: 1.0.0-rc.4
+    tag: 1.0.0-rc.5
     pullPolicy: IfNotPresent
 
   ## The official docker (dind) image, change tag to use a different version.