fix: add annotations for service and serviceAccount

Reviewed-on: #16

.drone.yml

@@ -11,7 +11,7 @@ steps:
 - name: helm lint
   commands:
   - helm lint
-  image: quay.io/helmpack/chart-testing:latest
+  image: docker.io/volkerraschek/helm:3.8.1
   resources:
     limits:
       cpu: 50
@@ -20,7 +20,7 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/tmknom/markdownlint:0.23.1
+  image: docker.io/volkerraschek/markdownlint:0.31.1
   resources:
     limits:
       cpu: 50
@@ -51,6 +51,34 @@ trigger:
     exclude:
     - tag
 
+---
+
+kind: pipeline
+type: kubernetes
+name: release
+
+platform:
+  os: linux
+
+steps:
+- name: release-helm-chart
+  commands:
+  - helm repo add volker.raschek https://charts.cryptic.systems/volker.raschek
+  - helm package --version ${DRONE_TAG} .
+  - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz volker.raschek
+  environment:
+    HELM_REPO_PASSWORD:
+      from_secret: helm_repo_password
+    HELM_REPO_USERNAME:
+      from_secret: helm_repo_username
+  image: docker.io/volkerraschek/helm:3.8.1
+
+trigger:
+  event:
+  - tag
+  repo:
+  - volker.raschek/drone-charts
+
 ---
 kind: pipeline
 type: kubernetes
@@ -95,6 +123,8 @@ steps:
     - failure
 
 trigger:
+  branch:
+  - master
   event:
   - push
   repo:

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false

.gitignore

@@ -1 +1,3 @@
-runner
+*.tgz
+values2.yml
+values2.yaml

.helmignore

@@ -0,0 +1,32 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+# drone
+.drone.yml
+# markdownlint
+.markdownlint.yaml
+# customized values
+values2.yml
+values2.yaml
+# helm packages
+*.tgz

Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: drone
 description: Drone Helm chart for Kubernetes
 type: application
-version: 0.1.0
-appVersion: 2.0.4
+version: "0.5.0"
+appVersion: "2.11.1"
 icon: https://readme.drone.io/logo.svg
 
 keywords:
@@ -12,8 +12,9 @@ keywords:
 - drone-runner
 - ci
 - cd
+
 sources:
-- https://git.cryptic.systems/volker.raschek/drone-charts
+- https://github.com/volker-raschek/drone-charts
 - https://github.com/drone/drone
 - https://hub.docker.com/r/drone/drone
 

README.md

@@ -41,6 +41,7 @@ be the options passed via the `--set` flag of the `helm install` command.
 | `config.DRONE_CRON_INTERVAL`                            | [Documentation](https://docs.drone.io/server/reference/drone-cron-interval)               |
 | `config.DRONE_DATABASE_DATASOURCE`                      | [Documentation](https://docs.drone.io/server/reference/drone-database-datasource)         |
 | `config.DRONE_DATABASE_DRIVER`                          | [Documentation](https://docs.drone.io/server/reference/drone-database-driver)             |
+| `config.DRONE_DATABASE_MAX_CONNECTIONS`                 | [Documentation](https://docs.drone.io/server/reference/drone_database-max-connections)    |
 | `config.DRONE_DATABASE_SECRET`                          | [Documentation](https://docs.drone.io/server/reference/drone-database-secret)             |
 | `config.DRONE_GIT_ALWAYS_AUTH`                          | [Documentation](https://docs.drone.io/server/reference/drone-git-always-auth)             |
 | `config.DRONE_GIT_PASSWORD`                             | [Documentation](https://docs.drone.io/server/reference/drone-git-password)                |
@@ -48,6 +49,11 @@ be the options passed via the `--set` flag of the `helm install` command.
 | `config.DRONE_GITEA_CLIENT_ID`                          | [Documentation](https://docs.drone.io/server/reference/drone-gitea-client-id)             |
 | `config.DRONE_GITEA_CLIENT_SECRET`                      | [Documentation](https://docs.drone.io/server/reference/drone-gitea-client-secret)         |
 | `config.DRONE_GITEA_SERVER`                             | [Documentation](https://docs.drone.io/server/reference/drone-gitea-server)                |
+| `config.DRONE_GITEA_SKIP_VERIFY`                        | [Documentation](https://docs.drone.io/server/reference/drone-gitea-skip-verify)           |
+| `config.DRONE_GITEE_REDIRECT_URL`                       | [Documentation](https://docs.drone.io/server/reference/drone-gitee-redirect-url)          |
+| `config.DRONE_GITEE_SCOPE`                              | [Documentation](https://docs.drone.io/server/reference/drone-gitee-scope)                 |
+| `config.DRONE_GITEE_SKIP_VERIFY`                        | [Documentation](https://docs.drone.io/server/reference/drone-gitee-skip-verify)           |
+| `config.DRONE_GITHUB_CLIENT_ID`                         | [Documentation](https://docs.drone.io/server/reference/drone-github-client-id)            |
 | `config.DRONE_GITHUB_CLIENT_SECRET`                     | [Documentation](https://docs.drone.io/server/reference/drone-github-client-secret)        |
 | `config.DRONE_GITHUB_SCOPE`                             | [Documentation](https://docs.drone.io/server/reference/drone-github-scope)                |
 | `config.DRONE_GITHUB_SERVER`                            | [Documentation](https://docs.drone.io/server/reference/drone-github-server)               |
@@ -77,6 +83,7 @@ be the options passed via the `--set` flag of the `helm install` command.
 | `config.DRONE_SERVER_PROXY_HOST`                        | [Documentation](https://docs.drone.io/server/reference/drone-server-proxy-host)           |
 | `config.DRONE_SERVER_PROXY_PROTO`                       | [Documentation](https://docs.drone.io/server/reference/drone-server-proxy-proto)          |
 | `config.DRONE_STARLARK_ENABLED`                         | [Documentation](https://docs.drone.io/server/reference/drone-starlark-enabled)            |
+| `config.DRONE_STARLARK_STEP_LIMIT`                      | [Documentation](https://docs.drone.io/server/reference/drone-starlark-step-limit)         |
 | `config.DRONE_STASH_CONSUMER_KEY`                       | [Documentation](https://docs.drone.io/server/reference/drone-stash-consumer-key)          |
 | `config.DRONE_STASH_PRIVATE_KEY`                        | [Documentation](https://docs.drone.io/server/reference/drone-stash-private-key)           |
 | `config.DRONE_STASH_SERVER`                             | [Documentation](https://docs.drone.io/server/reference/drone-stash-server)                |
@@ -87,6 +94,7 @@ be the options passed via the `--set` flag of the `helm install` command.
 | `config.DRONE_TLS_CERT`                                 | [Documentation](https://docs.drone.io/server/reference/drone-tls-cert)                    |
 | `config.DRONE_TLS_KEY`                                  | [Documentation](https://docs.drone.io/server/reference/drone-tls-key)                     |
 | `config.DRONE_USER_CREATE`                              | [Documentation](https://docs.drone.io/server/reference/drone-user-create)                 |
+| `config.DRONE_USER_FILTER`                              | [Documentation](https://docs.drone.io/server/reference/drone-user-filter)                 |
 | `config.DRONE_VALIDATE_PLUGIN_ENDPOINT`                 | [Documentation](https://docs.drone.io/server/reference/drone-validate-plugin-endpoint)    |
 | `config.DRONE_VALIDATE_PLUGIN_SECRET`                   | [Documentation](https://docs.drone.io/server/reference/drone-validate-plugin-secret)      |
 | `config.DRONE_VALIDATE_PLUGIN_SKIP_VERIFY`              | [Documentation](https://docs.drone.io/server/reference/drone-validate-plugin-skip-verify) |
@@ -97,8 +105,7 @@ be the options passed via the `--set` flag of the `helm install` command.
 
 ## Missing features
 
-1. Add Persistent Volume for the SQLite database
-2. Support postgres, maria and mysql database directly as helm dependency if as
+1. Support postgres, maria and mysql database directly as helm dependency if as
    `DATABASE_DRIVER` an other instead of `sqlite` has been selected.
    Alternatively can be passed a completely custom string to establish a
    database connection, when the database is running outside the cluster.

renovate.json

@@ -0,0 +1,37 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "automergeStrategy": "merge-commit",
+  "automergeType": "pr",
+  "assignees": [ "volker.raschek" ],
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/drone", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "addLabels": [ "renovate/drone", "renovate/automerge" ],
+      "automerge": false,
+      "matchPackageNames": [ "drone" ],
+      "matchManagers": [ "regex" ]
+    }
+  ],
+  "rebaseLabel": "renovate/rebase",
+  "rebaseWhen": "behind-base-branch",
+  "regexManagers": [
+    {
+      "description": "Update container image reference",
+      "fileMatch": [
+        "^Chart\\.yaml$"
+      ],
+      "matchStrings": [
+        "appVersion: \"(?<currentValue>.*?)\"\\s+"
+      ],
+      "datasourceTemplate": "docker",
+      "depNameTemplate": "drone",
+      "lookupNameTemplate": "docker.io/drone/drone"
+    }
+  ]
+}

templates/deployment.yaml

@@ -17,12 +17,6 @@ spec:
       labels:
         {{- include "drone.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
           envFrom:
@@ -36,16 +30,45 @@ spec:
             - name: http
               containerPort: 80
               protocol: TCP
-
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
+          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 }}
           {{- end }}
       {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.podPriorityClassName }}
+      priorityClassName: {{ .Values.podPriorityClassName }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      serviceAccountName: {{ include "drone.fullname" . }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if and (.Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3") .Values.persistence.existingClaim }}
+      volumes:
+      - name: data
+        persistentVolumeClaim:
+      {{- with .Values.persistence.existingClaim }}
+          claimName: {{ tpl . $ }}
+      {{- 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" . }}
+      {{- end }}

templates/persistentVolumeClaim.yaml

@@ -0,0 +1,17 @@
+{{ if and (.Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3") (not .Values.persistence.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "drone.fullname" . }}
+spec:
+  accessModes:
+  {{- range .Values.persistence.accessModes }}
+    - {{ . | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass | quote }}
+  {{- end }}
+{{- end }}

templates/service.yaml

@@ -1,9 +1,13 @@
 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:
   type: {{ .Values.service.type }}
   ports:

templates/serviceAccount.yaml

@@ -0,0 +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

@@ -16,6 +16,8 @@ fullnameOverride: ""
 
 podAnnotations: {}
 
+podPriorityClassName: ""
+
 podSecurityContext: {}
   # fsGroup: 2000
 
@@ -27,7 +29,7 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
-config:
+config: {}
   # DRONE_BITBUCKET_CLIENT_ID
   # String value. Configures the Bitbucket OAuth client id. This is used to
   # authorize access to Bitbucket on behalf of a Drone user.
@@ -134,6 +136,13 @@ config:
   # https://docs.drone.io/server/reference/drone-database-driver/
   # DRONE_DATABASE_DRIVER: ""
 
+  # DRONE_DATABASE_MAX_CONNECTIONS
+  # Optional numeric value. Set the maximum number of open DB connections from
+  # Drone. It is set to 0 by default and must be configured before the system is
+  # first used.
+  # https://docs.drone.io/server/reference/drone-database-max-connections/
+  # DRONE_DATABASE_MAX_CONNECTIONS: ""
+
   # DRONE_DATABASE_SECRET
   # Optional string value. Configures the secret key used to encrypt secrets in
   # the database. Encryption is disabled by default and must be configured
@@ -177,6 +186,34 @@ config:
   # https://docs.drone.io/server/reference/drone-gitea-server/
   # DRONE_GITEA_SERVER: ""
 
+  # DRONE_GITEA_SKIP_VERIFY
+  # Boolean value disables tls verification when establishing a connection to
+  # the remote Gitea server.
+  # https://docs.drone.io/server/reference/drone-gitea-skip-verify/
+  # DRONE_GITEA_SKIP_VERIFY: ""
+
+  # DRONE_GITEE_REDIRECT_URL
+  # String value configures the Gitee OAuth authorize redirect url.
+  # https://docs.drone.io/server/reference/drone-gitee-redirect-url/
+  # DRONE_GITEE_REDIRECT_URL: ""
+
+  # DRONE_GITEE_SCOPE
+  # String value provides a comma-separated list of OAuth scopes.
+  # https://docs.drone.io/server/reference/drone-gitee-scope/
+  # DRONE_GITEE_SCOPE: ""
+
+  # DRONE_GITEE_SKIP_VERIFY
+  # Boolean value disables TLS verification when establishing a connection to
+  # the remote Gitee server.
+  # https://docs.drone.io/server/reference/drone-gitee-skip-verify/
+  # DRONE_GITEE_SKIP_VERIFY: ""
+
+  # DRONE_GITHUB_CLIENT_ID
+  # String value configures the GitHub OAuth client id. This is used to
+  # authorize access to GitHub on behalf of a Drone user.
+  # https://docs.drone.io/server/reference/drone-github-client-id/
+  # DRONE_GITHUB_CLIENT_ID: ""
+
   # DRONE_GITHUB_CLIENT_SECRET
   # String value configures the GitHub oauth client secret. This is used to
   # authorize access to GitHub on behalf of a Drone user.
@@ -364,6 +401,13 @@ config:
   # https://docs.drone.io/server/reference/drone-starlark-enabled/
   # DRONE_STARLARK_ENABLED: ""
 
+  # DRONE_STARLARK_STEP_LIMIT
+  # Integer value. Sets the maximum number of steps that a starlark
+  # configuration can generate. The default is 50000. This feature requires
+  # Drone server version 2.2.1 or higher.
+  # https://docs.drone.io/server/reference/drone-starlark-step-limit/
+  # DRONE_STARLARK_STEP_LIMIT: ""
+
   # DRONE_STASH_CONSUMER_KEY
   # String value configures your Bitbucket Server consumer key.
   # https://docs.drone.io/server/reference/drone-stash-consumer-key/
@@ -429,6 +473,13 @@ config:
   # https://docs.drone.io/server/reference/drone-user-create/
   # DRONE_USER_CREATE: ""
 
+  # DRONE_USER_FILTER
+  # Optional comma-separated list of accounts. Registration is limited to users
+  # in this list, or users that are members of organizations included in this
+  # list.
+  # https://docs.drone.io/server/reference/drone-user-filter/
+  # DRONE_USER_FILTER: ""
+
   # DRONE_VALIDATE_PLUGIN_ENDPOINT
   # String value configures the endpoint for the validation plugin, used to
   # enforce custom linting rules for your pipeline configuration.
@@ -471,7 +522,11 @@ config:
   # https://docs.drone.io/server/reference/drone-webhook-skip-verify/
   # DRONE_WEBHOOK_SKIP_VERIFY: ""
 
+serviceAccount:
+  annotations: {}
+
 service:
+  annotations: {}
   type: ClusterIP
   port: 80
 
@@ -479,7 +534,9 @@ ingress:
   enabled: false
   className: "nginx"
   annotations:
-    # cert-manager.io/issuer: letsencrypt
+    # kubernetes.io/ingress.class: nginx
+    # cert-manager.io/issuer:
+    # kubernetes.io/tls-acme: "true"
   hosts:
   - host: "your-hostname"
     paths:
@@ -507,3 +564,14 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+# persistence is only required when config.DATABASE_DRIVER is sqlite3 or
+# undefined.
+persistence:
+  # existingClaim:
+  size: 5Gi
+  accessModes:
+  - ReadWriteOnce
+  labels: {}
+  annotation: {}
+  # storageClass: