Skip to content

Commit 3be2d71

Browse files
JancisJancis
committed
Pre-release hook
test
1 parent 33c8139 commit 3be2d71

File tree

7 files changed

+128
-4
lines changed

7 files changed

+128
-4
lines changed

‎charts/drupal/templates/_helpers.tpl

+18
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,24 @@ fi
672672
673673
{{- end }}
674674
675+
{{- define "drupal.pre-release-command" -}}
676+
set -e
677+
678+
{{- include "drupal.wait-for-db-command" . }}
679+
680+
{{- if .Values.elasticsearch.enabled }}
681+
{{ include "drupal.wait-for-elasticsearch-command" . }}
682+
{{ end }}
683+
684+
{{- if .Values.php.preupgrade.backup }}
685+
{{- include "drupal.backup-command" . }}
686+
{{- end }}
687+
688+
{{- if .Values.php.preupgrade.command }}
689+
{{- .Values.php.preupgrade.command }}
690+
{{- end }}
691+
{{- end }}
692+
675693
{{- define "cert-manager.api-version" }}
676694
{{- if ( .Capabilities.APIVersions.Has "cert-manager.io/v1" ) }}
677695
cert-manager.io/v1

‎charts/drupal/templates/backup-volume.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.backup.enabled }}
1+
{{- if or .Values.backup.enabled ( or (ne .Values.php.preupgrade.command "") .Values.php.preupgrade.backup ) }}
22
{{- if eq .Values.backup.storageClassName "silta-shared" }}
33
{{- if eq ( include "silta-cluster.rclone.has-provisioner" $ ) "false" }}
44
apiVersion: v1

‎charts/drupal/templates/pre-release.yaml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{{- if or (ne .Values.php.preupgrade.command "") .Values.php.preupgrade.backup }}
2+
{{- $claimName := printf "%s-backup" .Release.Name }}
3+
{{- if and ( eq $.Values.backup.storageClassName "silta-shared" ) ( eq ( include "silta-cluster.rclone.has-provisioner" $ ) "true" ) }}
4+
{{- $claimName = printf "%s-backup2" .Release.Name }}
5+
{{- end }}
6+
{{- if lookup "v1" "PersistentVolumeClaim" .Release.Namespace $claimName }}
7+
apiVersion: batch/v1
8+
kind: Job
9+
metadata:
10+
name: "{{ .Release.Name }}-pre-release"
11+
labels:
12+
{{- include "drupal.release_labels" . | nindent 4 }}
13+
annotations:
14+
# This is what defines this resource as a hook. Without this line, the
15+
# job is considered part of the release.
16+
"helm.sh/hook": "pre-upgrade"
17+
"helm.sh/hook-delete-policy": "before-hook-creation"
18+
spec:
19+
completions: 1
20+
backoffLimit: 0
21+
template:
22+
metadata:
23+
labels:
24+
{{- include "drupal.release_labels" . | nindent 8 }}
25+
spec:
26+
restartPolicy: Never
27+
enableServiceLinks: false
28+
containers:
29+
- name: pre-release
30+
{{- include "drupal.php-container" . | nindent 8 }}
31+
command: ["/bin/bash", "-c"]
32+
args:
33+
- |
34+
{{- include "drupal.pre-release-command" . | nindent 12 }}
35+
volumeMounts:
36+
{{- include "drupal.volumeMounts" . | nindent 10 }}
37+
{{- if .Values.php.preupgrade.backup }}
38+
- name: {{ .Release.Name }}-backup
39+
mountPath: /backups
40+
{{- end }}
41+
resources:
42+
{{- .Values.php.preupgrade.resources | toYaml | nindent 10 }}
43+
nodeSelector:
44+
{{- .Values.php.preupgrade.nodeSelector | toYaml | nindent 8 }}
45+
tolerations:
46+
{{- include "drupal.tolerations" .Values.php.preupgrade.nodeSelector | nindent 8 }}
47+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
48+
volumes:
49+
{{- include "drupal.volumes" . | nindent 8 }}
50+
{{- if .Values.php.preupgrade.backup }}
51+
- name: {{ .Release.Name }}-backup
52+
persistentVolumeClaim:
53+
{{- if and ( eq $.Values.backup.storageClassName "silta-shared" ) ( eq ( include "silta-cluster.rclone.has-provisioner" $ ) "true" ) }}
54+
claimName: {{ .Release.Name }}-backup2
55+
{{- else }}
56+
claimName: {{ .Release.Name }}-backup
57+
{{- end }}
58+
{{- end }}
59+
{{- end }}
60+
{{- end }}

‎charts/drupal/templates/shell-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
mountPath: /etc/ssh/authorized_keys
6161
subPath: authorizedKeys
6262
readOnly: true
63-
{{- if .Values.backup.enabled }}
63+
{{- if or .Values.backup.enabled ( or (ne .Values.php.preupgrade.command "") .Values.php.preupgrade.backup ) }}
6464
- name: {{ .Release.Name }}-backup
6565
mountPath: /backups
6666
readOnly: true
@@ -91,7 +91,7 @@ spec:
9191
- name: shell-configmap
9292
configMap:
9393
name: {{ .Release.Name }}-shell
94-
{{- if .Values.backup.enabled }}
94+
{{- if or .Values.backup.enabled ( or (ne .Values.php.preupgrade.command "") .Values.php.preupgrade.backup ) }}
9595
- name: {{ .Release.Name }}-backup
9696
persistentVolumeClaim:
9797
{{- if and ( eq $.Values.backup.storageClassName "silta-shared" ) ( eq ( include "silta-cluster.rclone.has-provisioner" $ ) "true" ) }}

‎charts/drupal/values.schema.json

+30-1
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,35 @@
342342
}
343343
}
344344
},
345+
"preupgrade": {
346+
"type": "object",
347+
"additionalProperties": false,
348+
"properties": {
349+
"backup": { "type": "boolean" },
350+
"command": { "type": "string" },
351+
"nodeSelector": { "type": "object" },
352+
"resources": {
353+
"type": "object",
354+
"additionalProperties": false,
355+
"properties": {
356+
"requests": {
357+
"type": "object",
358+
"properties": {
359+
"cpu": { "type": ["integer", "string"] },
360+
"memory": { "type": "string" }
361+
}
362+
},
363+
"limits": {
364+
"type": "object",
365+
"properties": {
366+
"cpu": { "type": ["integer", "string"] },
367+
"memory": { "type": "string" }
368+
}
369+
}
370+
}
371+
}
372+
}
373+
},
345374
"postupgrade": {
346375
"type": "object",
347376
"additionalProperties": false,
@@ -549,7 +578,7 @@
549578
}
550579
}
551580
}
552-
},
581+
},
553582
"mariadb": {
554583
"type": "object",
555584
"properties": {

‎charts/drupal/values.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,17 @@ php:
352352
afterCommand: |
353353
354354
355+
# Executes before the environment is installed. Could be useful for backups before environment is upgraded.
356+
preupgrade:
357+
backup: false
358+
command: ""
359+
resources:
360+
requests:
361+
cpu: 500m
362+
memory: 488Mi
363+
limits:
364+
memory: 488Mi
365+
355366
# Pass additional environment variables to all php containers as key-value pairs.
356367
env: {}
357368

‎silta/silta.yml

+6
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,9 @@ php:
5555
# The ~ symbol will be replaced by a random digit from 0 to 9.
5656
# This will avoid running all cron jobs at the same time.
5757
schedule: '~ 0 31 2 *'
58+
59+
php:
60+
preupgrade:
61+
# backup: true
62+
command: "echo 'Pre-upgrade command'"
63+

0 commit comments

Comments
 (0)