Merge pull request 'chore(deps): update dependency drone to v2.12.1' (#21) from renovate/drone-2.x into master

Reviewed-on: #21

.drone.yml

@@ -11,36 +11,47 @@ steps:
 - name: helm lint
   commands:
   - helm lint
-  image: docker.io/volkerraschek/helm:3.8.1
+  image: docker.io/volkerraschek/helm:3.9.2
   resources:
     limits:
-      cpu: 50
-      memory: 50M
+      cpu: 150
+      memory: 150M
 
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.31.1
+  image: docker.io/volkerraschek/markdownlint:0.32.1
   resources:
     limits:
-      cpu: 50
-      memory: 50M
+      cpu: 150
+      memory: 150M
+
+- name: helm template
+  commands:
+  - helm template .
+  image: docker.io/volkerraschek/helm:3.9.2
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
 
 - name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
+  image: docker.io/volkerraschek/drone-email:0.1.1
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -52,7 +63,6 @@ trigger:
     - tag
 
 ---
-
 kind: pipeline
 type: kubernetes
 name: release
@@ -71,61 +81,14 @@ steps:
       from_secret: helm_repo_password
     HELM_REPO_USERNAME:
       from_secret: helm_repo_username
-  image: docker.io/volkerraschek/helm:3.8.1
+  image: docker.io/volkerraschek/helm:3.9.2
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
 
 trigger:
   event:
   - tag
   repo:
   - volker.raschek/drone-charts
-
----
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/drone-charts.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - push
-  repo:
-  - volker.raschek/drone-charts

Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: drone
 description: Drone Helm chart for Kubernetes
 type: application
-version: "0.5.0"
-appVersion: "2.11.1"
+version: "0.7.1"
+appVersion: "2.12.1"
 icon: https://readme.drone.io/logo.svg
 
 keywords:

templates/deployment.yaml

@@ -26,16 +26,37 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          livenessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /healthz
+              port: http
           ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
+          - name: http
+            containerPort: 80
+            protocol: TCP
+          - name: https
+            containerPort: 443
+            protocol: TCP
+          readinessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /healthz
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}
           volumeMounts:
           - name: data
             mountPath: {{ default "/data/database.sqlite" .Values.config.DRONE_DATABASE_DATASOURCE | dir }}
+          {{- with .Values.extraVolumeMounts }}
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+          {{- else }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
           {{- end }}
       {{- with .Values.affinity }}
       affinity:
@@ -66,9 +87,20 @@ spec:
       {{- with .Values.persistence.existingClaim }}
           claimName: {{ tpl . $ }}
       {{- end }}
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- else if and (.Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3") (not .Values.persistence.existingClaim) }}
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: {{ include "drone.fullname" . }}
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- else }}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- end }}

templates/service.yaml

@@ -1,15 +1,36 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "drone.fullname" . }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     {{- include "drone.labels" . | nindent 4 }}
+  name: {{ include "drone.fullname" . }}
 spec:
+  {{- with .Values.service.externalIPs }}
+  externalIPs:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- if .Values.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+  {{- end }}
+  {{- if and .Values.service.loadBalancerClass (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerClass: {{ .Values.service.loadBalancerClass }}
+  {{- end }}
+  {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- with .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
-      name: http
+      name: {{ .Values.service.name }}
   selector:
     {{- include "drone.selectorLabels" . | nindent 4 }}

templates/serviceAccount.yaml

@@ -1,4 +1,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "drone.labels" . | nindent 4 }}
   name: {{ include "drone.fullname" . }}

values.yaml

@@ -522,7 +522,19 @@ config: {}
   # https://docs.drone.io/server/reference/drone-webhook-skip-verify/
   # DRONE_WEBHOOK_SKIP_VERIFY: ""
 
+serviceAccount:
+  annotations: {}
+
 service:
+  annotations: {}
+  # externalIPs: []
+  # externalTrafficPolicy: "Cluster"
+  # loadBalancerClass: ""
+  # loadBalancerIP: ""
+  # loadBalancerSourceRanges: []
+  # internalTrafficPolicy: "Cluster"
+  name: http
+  targetPort: 80
   type: ClusterIP
   port: 80
 
@@ -564,10 +576,42 @@ affinity: {}
 # persistence is only required when config.DATABASE_DRIVER is sqlite3 or
 # undefined.
 persistence:
+  annotation: {}
   # existingClaim:
   size: 5Gi
   accessModes:
   - ReadWriteOnce
   labels: {}
-  annotation: {}
-  # storageClass:
+  # storageClass:
+
+# extra volumes for the pod
+extraVolumes: {}
+# The following example mount the same secret, which contains tls certificates
+# under different names. Each volume mount contains only selected items of the
+# secret. This make it easier to place the items on different locations inside the
+# container filesystem via extraVolumeMounts.
+# - name: custom-ca-anchor
+#   secret:
+#     secretName: drone-custom-tls-certificates
+#     items:
+#     - key: ca.crt
+#       path: ca.crt
+#       mode: 0444
+# - name: custom-tls-certificates
+#   secret:
+#     secretName: drone-custom-tls-certificates
+#     items:
+#     - key: tls.key
+#       path: tls.key
+#       mode: 0400
+#     - key: tls.crt
+#       path: tls.crt
+#       mode: 0444
+
+extraVolumeMounts: {}
+# The following example follows the example of extraVolumes and mounts the
+# volumes to the corresponding paths in the container filesystem.
+# - name: custom-ca-anchor
+#   mountPath: /usr/local/share/ca-certificates
+# - name: custom-tls-certificates
+#   mountPath: /etc/drone/tls