6 Commits

Author SHA1 Message Date
1d2c04ede7 chore(deps): update dependency docker.io/volkerraschek/helm to v3.8.2
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2022-05-11 10:31:06 +02:00
5cadbd31a2 fix: add liveness and readiness probe
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-21 23:13:14 +02:00
c7346ec71a feat: add loadBlancer options to the service 2022-04-21 22:58:41 +02:00
04e6d2214c feat: support extraVolumes and extraVolumeMounts 2022-04-21 22:37:56 +02:00
6f36f2b794 fix(drone): remove sync via drone - use instead gitea push feature
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-19 22:27:51 +02:00
fc2dd72561 fix: add annotations for service and serviceAccount
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-19 11:51:34 +02:00
5 changed files with 111 additions and 61 deletions

View File

@@ -11,7 +11,7 @@ steps:
- name: helm lint
commands:
- helm lint
image: docker.io/volkerraschek/helm:3.8.1
image: docker.io/volkerraschek/helm:3.8.2
resources:
limits:
cpu: 50
@@ -71,61 +71,10 @@ 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.8.2
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

View File

@@ -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: {{ .Values.config.DRONE_SERVER_PROTO | upper | default "HTTP" }}
path: /healthz
port: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }}
ports:
- name: http
containerPort: 80
protocol: TCP
- name: http
containerPort: 80
protocol: TCP
- name: https
containerPort: 443
protocol: TCP
readinessProbe:
httpGet:
scheme: {{ .Values.config.DRONE_SERVER_PROTO | upper | default "HTTP" }}
path: /healthz
port: {{ .Values.config.DRONE_SERVER_PROTO | default "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 }}

View File

@@ -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.config.DRONE_SERVER_PROTO | default "http" }}
protocol: TCP
name: http
name: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }}
selector:
{{- include "drone.selectorLabels" . | nindent 4 }}

View File

@@ -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" . }}

View File

@@ -522,7 +522,17 @@ 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"
type: ClusterIP
port: 80
@@ -564,10 +574,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