From ac526fa232ebd07452d46fb0028a82d72cfac4b7 Mon Sep 17 00:00:00 2001
From: mihirat <teketen5656@gmail.com>
Date: Fri, 29 Jun 2018 03:25:31 +0900
Subject: [PATCH] Add support for Google Cloud SQL to use as a backend (#6016)

* added cloud sql proxy container

* Add cloud sql proxy

* make changes on stable/drone

* update for general usage [stable/drone]

* Bump minor version for new feature
---
 stable/drone/Chart.yaml                       | 2 +-
 stable/drone/README.md                        | 2 ++
 stable/drone/templates/deployment-server.yaml | 6 ++++++
 stable/drone/values.yaml                      | 7 +++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml
index ce01d273a1..750aec7108 100644
--- a/stable/drone/Chart.yaml
+++ b/stable/drone/Chart.yaml
@@ -1,7 +1,7 @@
 name: drone
 home: https://drone.io/
 icon: https://drone.io/apple-touch-icon.png
-version: 1.2.0
+version: 1.3.0
 appVersion: 0.8.5
 description: Drone is a Continuous Delivery system built on container technology
 keywords:
diff --git a/stable/drone/README.md b/stable/drone/README.md
index 3449c91ec0..6f0b577664 100644
--- a/stable/drone/README.md
+++ b/stable/drone/README.md
@@ -56,6 +56,8 @@ The following table lists the configurable parameters of the drone charts and th
 | `server.resources`          | Drone **server** pod resource requests & limits                                               | `{}`                        |
 | `server.schedulerName`      | Drone **server** alternate scheduler name                                                     | `nil`                       |
 | `server.affinity`           | Drone **server** scheduling preferences                                                       | `{}`                        |
+| `server.extraContainers`    | Additional sidecar containers | `""` |
+| `server.extraVolumes`       | Additional volumes for use in extraContainers | `""` |
 | `agent.env`                 | Drone **agent** environment variables                                                         | `(default values)`          |
 | `agent.replicas`            | Drone **agent** replicas                                                                      | `1`                         |
 | `agent.annotations`         | Drone **agent** annotations                                                                   | `{}`                        |
diff --git a/stable/drone/templates/deployment-server.yaml b/stable/drone/templates/deployment-server.yaml
index d33ae7fa1a..f475ece4ff 100644
--- a/stable/drone/templates/deployment-server.yaml
+++ b/stable/drone/templates/deployment-server.yaml
@@ -76,6 +76,9 @@ spec:
         volumeMounts:
           - name: data
             mountPath: /var/lib/drone
+{{- with .Values.server.extraContainers }}
+{{ tpl . $ | indent 6 }}
+{{- end }}
       volumes:
       - name: data
       {{- if .Values.persistence.enabled }}
@@ -84,4 +87,7 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end -}}
+{{- with .Values.server.extraVolumes }}
+{{ tpl . $ | indent 6 }}
+{{- end }}
 {{ end }}
diff --git a/stable/drone/values.yaml b/stable/drone/values.yaml
index 9ccb7861e3..eef2f00b57 100644
--- a/stable/drone/values.yaml
+++ b/stable/drone/values.yaml
@@ -122,6 +122,13 @@ server:
   ##
   affinity: {}
 
+  ## additional siecar containers, e. g. for a database proxy, such as Google's cloudsql-proxy.
+  ## ex: https://github.com/kubernetes/charts/tree/master/stable/keycloak
+  extraContainers: |
+
+  ## additional volumes, e. g. for secrets used in an extraContainers.
+  extraVolumes: |
+
 agent:
   ## Drone agent configuration.
   ## Values in here get injected as environment variables.