fix: make probes configurable

.drone.yml

@@ -17,7 +17,7 @@ steps:
 - name: helm lint
   commands:
   - helm lint
-  image: git.cryptic.systems/volker.raschek/helm:3.13.3
+  image: git.cryptic.systems/volker.raschek/helm:3.16.1
   resources:
     limits:
       cpu: 150
@@ -26,7 +26,7 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.38.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.41.0
   resources:
     limits:
       cpu: 150
@@ -35,7 +35,7 @@ steps:
 - name: helm template
   commands:
   - helm template .
-  image: git.cryptic.systems/volker.raschek/helm:3.13.3
+  image: git.cryptic.systems/volker.raschek/helm:3.16.1
   resources:
     limits:
       cpu: 150
@@ -85,6 +85,7 @@ steps:
 
 - name: release-helm-chart
   commands:
+  - grep -o 'version:"${DRONE_TAG}"' Chart.yaml || echo "Version ${DRONE_TAG} not found in Chart.yaml"
   - helm repo add drone https://charts.cryptic.systems/drone
   - helm package --version ${DRONE_TAG} .
   - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz drone
@@ -93,7 +94,7 @@ steps:
       from_secret: helm_repo_password
     HELM_REPO_USERNAME:
       from_secret: helm_repo_username
-  image: git.cryptic.systems/volker.raschek/helm:3.13.3
+  image: git.cryptic.systems/volker.raschek/helm:3.16.1
   resources:
     limits:
       cpu: 150

Chart.yaml

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

renovate.json

@@ -1,7 +1,5 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automergeStrategy": "merge-commit",
-  "automergeType": "pr",
   "assignees": [ "volker.raschek" ],
   "labels": [ "renovate" ],
   "packageRules": [

templates/deployment.yaml

@@ -5,6 +5,11 @@ metadata:
   labels:
     {{- include "drone.labels" . | nindent 4 }}
 spec:
+  {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}
+  replicas: 1
+  {{- else }}
+  replicas: {{ .Values.replicas | default 1 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "drone.selectorLabels" . | nindent 6 }}
@@ -17,20 +22,21 @@ spec:
       labels:
         {{- include "drone.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           envFrom:
           - secretRef:
               name: {{ include "drone.fullname" . }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.livenessProbe }}
           livenessProbe:
-            httpGet:
+            {{- toYaml . | nindent 12 }}
-              scheme: HTTP
+          {{- end }}
-              path: /healthz
-              port: http
           ports:
           - name: http
             containerPort: 80
@@ -38,14 +44,15 @@ spec:
           - name: https
             containerPort: 443
             protocol: TCP
+          {{- with .Values.readinessProbe }}
           readinessProbe:
-            httpGet:
+            {{- toYaml . | nindent 12 }}
-              scheme: HTTP
+          {{- end }}
-              path: /healthz
-              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
           volumeMounts:
           - name: data
             mountPath: {{ default "/data/database.sqlite" .Values.config.DRONE_DATABASE_DATASOURCE | dir }}
@@ -58,10 +65,6 @@ spec:
             {{- toYaml . | nindent 10 }}
           {{- end }}
           {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

values.yaml

@@ -19,13 +19,11 @@ podPriorityClassName: ""
 podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext: {}
+# Increasing the amount of replicas has no effect, when `DRONE_DATABASE_DRIVER`
-  # capabilities:
+# is set to sqlite3.
-  #   drop:
+replicas: 1
-  #   - ALL
+
-  # readOnlyRootFilesystem: true
+affinity: {}
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
 config: {}
   # DRONE_BITBUCKET_CLIENT_ID
@@ -520,22 +518,6 @@ 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
-
 ingress:
   enabled: false
   className: "nginx"
@@ -553,6 +535,20 @@ ingress:
       hosts:
         - "your-hostname"
 
+livenessProbe:
+  httpGet:
+    scheme: HTTP
+    path: /healthz
+    port: http
+
+nodeSelector: {}
+
+readinessProbe:
+  httpGet:
+    scheme: HTTP
+    path: /healthz
+    port: http
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
@@ -565,12 +561,32 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-nodeSelector: {}
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+serviceAccount:
+  annotations: {}
+
+service:
+  annotations: {}
+  # externalIPs: []
+  # externalTrafficPolicy: "Cluster"
+  # loadBalancerClass: ""
+  # loadBalancerIP: ""
+  # loadBalancerSourceRanges: []
+  # internalTrafficPolicy: "Cluster"
+  name: http
+  targetPort: 80
+  type: ClusterIP
+  port: 80
 
 tolerations: []
 
-affinity: {}
-
 # persistence is only required when config.DATABASE_DRIVER is sqlite3 or
 # undefined.
 persistence: