bump drone chart version and fixed yaml format issue (#88)

charts/drone/latest/Chart.yaml

 name: drone
 home: https://drone.io/
 icon: https://drone.io/apple-touch-icon.png
-version: 1.7.0
+version: 1.7.4
 appVersion: 0.8.6
 description: Drone is a Continuous Delivery system built on container technology
 keywords:

charts/drone/latest/README.md

@@ -13,6 +13,7 @@ The following table lists the configurable parameters of the drone charts and th
 | `images.dind.repository`    | Docker **dind** image                                                                         | `docker.io/library/docker`  |
 | `images.dind.tag`           | Docker **dind** image tag                                                                     | `18.06.1-ce-dind`           |
 | `images.dind.pullPolicy`    | Docker **dind** image pull policy                                                             | `IfNotPresent`              |
+| `service.annotations`       | Service annotations                                                                           | `{}`                        |
 | `service.httpPort`          | Drone's Web GUI HTTP port                                                                     | `80`                        |
 | `service.nodePort`          | If `service.type` is `NodePort` and this is non-empty, sets the http node port of the service | `32015`                     |
 | `service.type`              | Service type (ClusterIP, NodePort or LoadBalancer)                                            | `ClusterIP`                 |

charts/drone/latest/questions.yml

@@ -161,6 +161,11 @@ questions:
     description: "If undefined or null, uses the default StorageClass. Default to null"
     type: storageclass
     label: Default StorageClass for Drone
+  - variable: persistence.existingClaim
+    default: ""
+    description: "If not empty, uses the specified existing PVC instead of creating new one"
+    type: pvc
+    label: Uses Existing Persistent Volume Cliam
 - variable: ingress.enabled
   default: false
   description: "Expose app using Layer 7 Load Balancer - ingress"

charts/drone/latest/templates/NOTES.txt

@@ -45,12 +45,12 @@ control provider:
 
     helm upgrade {{ .Release.Name }} \
       --reuse-values \
-      --set server.env.DRONE_PROVIDER="github" \
-      --set server.env.DRONE_GITHUB="true" \
-      --set server.env.DRONE_ORGS="my-github-org" \
-      --set server.env.DRONE_GITHUB_CLIENT="github-oauth2-client-id" \
-      --set server.envSecrets.drone-server-secrets[0]=DRONE_GITHUB_SECRET \
-      incubator/drone
+      --set 'server.env.DRONE_PROVIDER="github"' \
+      --set 'server.env.DRONE_GITHUB="true"' \
+      --set 'server.env.DRONE_ORGS="my-github-org"' \
+      --set 'server.env.DRONE_GITHUB_CLIENT="github-oauth2-client-id"' \
+      --set 'server.envSecrets.drone-server-secrets[0]=DRONE_GITHUB_SECRET' \
+      stable/drone
 
 Currently supported providers:
 

charts/drone/latest/templates/_helpers.tpl

@@ -26,19 +26,17 @@ Create the name of the service account to use
 {{- end -}}
 
 {{- define "drone.server.provider" -}}
-{{- if hasKey .Values.server.env "DRONE_PROVIDER" }}
 {{- if eq .Values.server.env.DRONE_PROVIDER "github" -}}
-{{ printf "DRONE_GITHUB" -}}
-{{- else if eq .Values.server.env.DRONE_PROVIDER "gitlab" }}
-{{ printf "DRONE_GITLAB" -}}
-{{- else if eq .Values.server.env.DRONE_PROVIDER "gitea" }}
-{{ printf "DRONE_GITEA" -}}
-{{- else if eq .Values.server.env.DRONE_PROVIDER "gogs" }}
-{{ printf "DRONE_GOGS" -}}
-{{- else if eq .Values.server.env.DRONE_PROVIDER "bitbucket" }}
-{{ printf "DRONE_BITBUCKET" -}}
-{{- else if eq .Values.server.env.DRONE_PROVIDER "coding" }}
-{{ printf "DRONE_CODING" -}}
-{{- end -}}
+{{- print "%s" "DRONE_GITHUB" -}}
+{{- else if eq .Values.server.env.DRONE_PROVIDER "gitlab" -}}
+{{- print "DRONE_GITLAB" -}}
+{{- else if eq .Values.server.env.DRONE_PROVIDER "gitea" -}}
+{{- print "DRONE_GITEA" -}}
+{{- else if eq .Values.server.env.DRONE_PROVIDER "gogs" -}}
+{{- print "DRONE_GOGS" -}}
+{{- else if eq .Values.server.env.DRONE_PROVIDER "bitbucket" -}}
+{{- print "DRONE_BITBUCKET" -}}
+{{- else if eq .Values.server.env.DRONE_PROVIDER "coding" -}}
+{{- print "DRONE_CODING" -}}
 {{- end -}}
 {{- end -}}

charts/drone/latest/templates/ingress.yaml

@@ -21,9 +21,9 @@ spec:
       http:
         paths:
         {{- if index $.Values.ingress "annotations" }}
-          {{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" }}
+          {{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" }}
           - path: /*
-          {{- else }}{{/* Has annotations but ingress class is not "gce" */}}
+          {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
           - path: /
           {{- end }}
         {{- else}}{{/* Has no annotations */}}

charts/drone/latest/templates/service.yaml

@@ -2,6 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "drone.fullname" . }}
+  annotations:
+  {{- range $key, $value := .Values.service.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
   labels:
     app: {{ template "drone.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"

charts/drone/latest/values.yaml

@@ -37,6 +37,13 @@ service:
   ##
   type: NodePort
 
+  ## Drone Service annotations
+  ##
+  # annotations:
+  #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
+  #   service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:xx-xxxx-x:xxxxxxxxxxx:certificate/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
+  #   external-dns.alpha.kubernetes.io/hostname: drone.domain.tld.
+
 ingress:
   ## If true, Drone Ingress will be created.
   ##