.drone.yml

@@ -12,12 +12,12 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: helm lint
   commands:
   - helm lint
-  image: git.cryptic.systems/volker.raschek/helm:3.17.1
+  image: git.cryptic.systems/volker.raschek/helm:3.15.0
   resources:
     limits:
       cpu: 150
@@ -26,7 +26,7 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.44.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.17.1
+  image: git.cryptic.systems/volker.raschek/helm:3.15.0
   resources:
     limits:
       cpu: 150
@@ -81,11 +81,11 @@ platform:
 
 steps:
 - name: clone
-  image: git.cryptic.systems/volker.raschek/git:1.4.0
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
 
 - name: release-helm-chart
   commands:
-  - grep -o 'version:"${DRONE_TAG}"' Chart.yaml || echo "Version ${DRONE_TAG} not found in Chart.yaml"
+  - grep --only-matching '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
@@ -94,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.17.1
+  image: git.cryptic.systems/volker.raschek/helm:3.15.0
   resources:
     limits:
       cpu: 150

Chart.yaml

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

templates/deployment.yaml

@@ -22,21 +22,20 @@ 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:
-            {{- toYaml . | nindent 12 }}
+            httpGet:
-          {{- end }}
+              scheme: HTTP
+              path: /healthz
+              port: http
           ports:
           - name: http
             containerPort: 80
@@ -44,15 +43,14 @@ spec:
           - name: https
             containerPort: 443
             protocol: TCP
-          {{- with .Values.readinessProbe }}
           readinessProbe:
-            {{- toYaml . | nindent 12 }}
+            httpGet:
-          {{- end }}
+              scheme: HTTP
+              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 }}
@@ -65,8 +63,8 @@ spec:
             {{- toYaml . | nindent 10 }}
           {{- end }}
           {{- end }}
-      {{- with .Values.initContainers }}
+      {{- with .Values.affinity }}
-      initContainers:
+      affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.imagePullSecrets }}

values.yaml

@@ -23,7 +23,13 @@ podSecurityContext: {}
 # is set to sqlite3.
 replicas: 1
 
-affinity: {}
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
 
 config: {}
   # DRONE_BITBUCKET_CLIENT_ID
@@ -518,6 +524,22 @@ 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"
@@ -535,22 +557,6 @@ ingress:
       hosts:
         - "your-hostname"
 
-initContainers: []
-
-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
@@ -563,32 +569,12 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-securityContext: {}
+nodeSelector: {}
-  # 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: