Skip to content

Commit 515fc33

Browse files
Rade333Rade333
authored
Merge pull request #465 from wunderio/release/2025-01-21
Release 2025-01-21
2 parents 9193dee + 60e67a3 commit 515fc33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+886
-206
lines changed

‎.github/workflows/pull-request.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# Available minikube kubernetes version list:
2323
# "minikube config defaults kubernetes-version"
2424
# and https://kubernetes.io/releases/patch-releases/
25-
kubernetes-version: ["v1.22.17", "v1.23.17", "v1.24.17", "v1.25.16", "v1.26.15", "v1.27.13", "v1.28.9", "v1.29.4", "v1.30.0", "latest"]
25+
kubernetes-version: ["v1.22.17", "v1.23.17", "v1.24.17", "v1.25.16", "v1.26.15", "v1.27.16", "v1.28.13", "v1.29.8", "v1.30.4", "v1.31.0", "latest"]
2626
env:
2727
CLUSTER_DOMAIN: minikube.local.wdr.io
2828
K8S_PROJECT_REPO_DIR: k8s-project-repositories
@@ -41,7 +41,7 @@ jobs:
4141
- name: Helm and repository setup
4242
run: |
4343
# Install Helm 3
44-
HELM_VERSION=v3.14.0
44+
HELM_VERSION=v3.16.3
4545
curl -o /tmp/helm.tar.gz https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz \
4646
&& tar -zxvf /tmp/helm.tar.gz -C /tmp \
4747
&& mv /tmp/linux-amd64/helm ~/.local/bin/helm \
@@ -150,8 +150,8 @@ jobs:
150150
cert-manager jetstack/cert-manager \
151151
--namespace cert-manager \
152152
--create-namespace \
153-
--version v1.8.0 \
154-
--set installCRDs=true \
153+
--version v1.16.2 \
154+
--set crds.enabled=true \
155155
--set global.logLevel=1 \
156156
--wait
157157

‎drupal/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ dependencies:
1919
version: 8.5.1
2020
- name: silta-release
2121
repository: file://../silta-release
22-
version: 1.0.0
23-
digest: sha256:74ab4b2e06e75563a3838c0a20311d052e2d7aeb6e00b4602fae6e9a2fd77fa0
24-
generated: "2023-10-03T12:07:07.444943085+03:00"
22+
version: 1.0.1
23+
digest: sha256:b7f96b2faca0716d5dd2b8d4a21f053cea6c0fdd8c7391f463e9c677c7c00196
24+
generated: "2025-01-21T14:03:49.041107+02:00"

‎drupal/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: drupal
3-
version: 1.16.0
3+
version: 1.17.0
44
dependencies:
55
- name: mariadb
66
version: 7.5.x

‎drupal/templates/_helpers.tpl

+10-2
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ imagePullSecrets:
331331
{{- define "drupal.wait-for-db-command" }}
332332
TIME_WAITING=0
333333
echo "Waiting for database.";
334-
until mysqladmin status --connect_timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST -P ${DB_PORT:-3306} --silent; do
334+
until mysqladmin status --connect-timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST -P ${DB_PORT:-3306} --silent; do
335335
echo -n "."
336336
sleep 5
337337
TIME_WAITING=$((TIME_WAITING+5))
@@ -655,7 +655,7 @@ fi
655655
TIME_WAITING=0
656656
echo "Waiting for database.";
657657
658-
until mysqladmin status --connect_timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST --protocol=tcp --silent; do
658+
until mysqladmin status --connect-timeout=2 -u $DB_USER -p$DB_PASS -h $DB_HOST --protocol=tcp --silent; do
659659
echo -n "."
660660
sleep 1s
661661
TIME_WAITING=$((TIME_WAITING+1))
@@ -732,3 +732,11 @@ autoscaling/v2beta1
732732
{{- else }}false
733733
{{- end }}
734734
{{- end }}
735+
736+
{{- define "drupal.serviceAccountName" }}
737+
{{- if .Values.serviceAccount.name }}
738+
{{- .Values.serviceAccount.name }}
739+
{{- else }}
740+
{{- .Release.Name }}-sa
741+
{{- end }}
742+
{{- end }}

‎drupal/templates/backup-cron.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
{{- else }}
7777
claimName: {{ .Release.Name }}-backup
7878
{{- end }}
79-
{{- include "drupal.imagePullSecrets" . | nindent 10 }}
79+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
8080
{{- end }}
8181

8282
---

‎drupal/templates/clamav-deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,5 @@ spec:
7676
- name: avdata
7777
source:
7878
emptyDir: {}
79+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
7980
{{- end }}

‎drupal/templates/drupal-cron.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ spec:
159159
volumes:
160160
{{- include "drupal.volumes" $ | nindent 12 }}
161161

162-
{{- include "drupal.imagePullSecrets" $ | nindent 10 }}
162+
serviceAccountName: {{ include "drupal.serviceAccountName" $ }}
163163
---
164164
{{- end }}
165165
{{- end }}

‎drupal/templates/drupal-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ spec:
166166
- name: sigsci-tmp
167167
emptyDir: {}
168168
{{- end }}
169-
{{- include "drupal.imagePullSecrets" . | nindent 6 }}
169+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
170170
nodeSelector:
171171
{{- .Values.php.nodeSelector | toYaml | nindent 8 }}
172172
tolerations:

‎drupal/templates/post-release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
{{- end }}
4141
resources:
4242
{{- .Values.php.postinstall.resources | toYaml | nindent 10 }}
43-
{{- include "drupal.imagePullSecrets" . | nindent 6 }}
43+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
4444
volumes:
4545
{{- include "drupal.volumes" . | nindent 8 }}
4646
{{- if .Values.referenceData.enabled -}}

‎drupal/templates/reference-data-cron.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
{{- else }}
5454
claimName: {{ include "drupal.referenceEnvironment" . }}-reference-data
5555
{{- end }}
56-
{{- include "drupal.imagePullSecrets" . | nindent 10 }}
56+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
5757
{{- end }}
5858
{{- end }}
5959
---

‎drupal/templates/serviceaccount.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: {{ .Release.Name }}-sa
5+
labels:
6+
{{- include "drupal.release_labels" . | nindent 4 }}
7+
automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
8+
{{- include "drupal.imagePullSecrets" . }}
9+

‎drupal/templates/shell-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ spec:
100100
claimName: {{ .Release.Name }}-backup
101101
{{- end }}
102102
{{- end }}
103-
{{- include "drupal.imagePullSecrets" . | nindent 6 }}
103+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
104104
{{- end }}
105105
---

‎drupal/templates/silta-hub.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data:
3535
{{- include "drupal.volumeMounts" . | nindent 14 }}
3636
resources:
3737
{{- .Values.php.postinstall.resources | toYaml | nindent 14 }}
38-
{{- include "drupal.imagePullSecrets" . | nindent 10 }}
38+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
3939
volumes:
4040
{{- include "drupal.volumes" . | nindent 12 }}
4141
syncPullJob: |
@@ -63,6 +63,6 @@ data:
6363
{{- include "drupal.volumeMounts" . | nindent 14 }}
6464
resources:
6565
{{- .Values.php.postinstall.resources | toYaml | nindent 14 }}
66-
{{- include "drupal.imagePullSecrets" . | nindent 10 }}
66+
serviceAccountName: {{ .Release.Name }}-sa
6767
volumes:
6868
{{- include "drupal.volumes" . | nindent 12 }}

‎drupal/templates/solr-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
volumes:
8080
- name: {{ .Release.Name }}-core-dir
8181
emptyDir: {}
82-
82+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
8383
volumeClaimTemplates:
8484
- metadata:
8585
name: {{ .Release.Name }}-solr-data

‎drupal/templates/varnish-deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,5 @@ spec:
7474
- name: varnish-secret
7575
secret:
7676
secretName: {{ .Release.Name }}-secrets-varnish
77+
serviceAccountName: {{ include "drupal.serviceAccountName" . }}
7778
{{- end }}

‎drupal/tests/private_docker_image_test.yaml

+5-31
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,21 @@
11
suite: private docker image
22
templates:
3-
- drupal-configmap.yaml
4-
- drupal-cron.yaml
5-
- drupal-deployment.yaml
6-
- drupal-secret.yaml
7-
- post-release.yaml
8-
capabilities:
9-
apiVersions:
10-
- pxc.percona.com/v1
3+
- serviceaccount.yaml
4+
115
tests:
126
- it: has no image pull secret by default
13-
template: drupal-deployment.yaml
7+
template: serviceaccount.yaml
148
asserts:
159
- isNull:
1610
path: spec.template.spec.imagePullSecrets
17-
- template: drupal-cron.yaml
18-
isNull:
19-
path: spec.jobTemplate.spec.template.spec.imagePullSecrets
20-
- template: post-release.yaml
21-
isNull:
22-
path: spec.template.spec.imagePullSecrets
2311

2412
- it: sets the image pull secret
25-
template: drupal-deployment.yaml
13+
template: serviceaccount.yaml
2614
set:
2715
imagePullSecrets:
2816
- name: gcr
2917
asserts:
3018
- contains:
31-
path: spec.template.spec.imagePullSecrets
32-
content:
33-
name: gcr
34-
35-
- template: drupal-cron.yaml
36-
contains:
37-
path: spec.jobTemplate.spec.template.spec.imagePullSecrets
19+
path: imagePullSecrets
3820
content:
3921
name: gcr
40-
41-
- template: post-release.yaml
42-
contains:
43-
path: spec.template.spec.imagePullSecrets
44-
content:
45-
name: gcr
46-
47-

‎drupal/tests/serviceaccount_test.yaml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
suite: service account test
2+
templates:
3+
- drupal-configmap.yaml
4+
- drupal-cron.yaml
5+
- drupal-deployment.yaml
6+
- drupal-secret.yaml
7+
- post-release.yaml
8+
- backup-cron.yaml
9+
tests:
10+
- it: has default release serviceaccount by default
11+
template: drupal-deployment.yaml
12+
set:
13+
backup:
14+
enabled: true
15+
asserts:
16+
- template: drupal-deployment.yaml
17+
equal:
18+
path: spec.template.spec.serviceAccountName
19+
value: RELEASE-NAME-sa
20+
- template: drupal-cron.yaml
21+
equal:
22+
path: spec.jobTemplate.spec.template.spec.serviceAccountName
23+
value: RELEASE-NAME-sa
24+
- template: post-release.yaml
25+
equal:
26+
path: spec.template.spec.serviceAccountName
27+
value: RELEASE-NAME-sa
28+
- template: backup-cron.yaml
29+
equal:
30+
path: spec.jobTemplate.spec.template.spec.serviceAccountName
31+
value: RELEASE-NAME-sa
32+
33+
- it: can set a custom serviceaccount
34+
template: drupal-deployment.yaml
35+
set:
36+
serviceAccount:
37+
name: foo
38+
backup:
39+
enabled: true
40+
asserts:
41+
- template: drupal-deployment.yaml
42+
equal:
43+
path: spec.template.spec.serviceAccountName
44+
value: foo
45+
- template: drupal-cron.yaml
46+
equal:
47+
path: spec.jobTemplate.spec.template.spec.serviceAccountName
48+
value: foo
49+
- template: post-release.yaml
50+
equal:
51+
path: spec.template.spec.serviceAccountName
52+
value: foo
53+
- template: backup-cron.yaml
54+
equal:
55+
path: spec.jobTemplate.spec.template.spec.serviceAccountName
56+
value: foo

‎drupal/values.schema.json

+8
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
"branchName": { "type": "string" },
99
"imagePullSecrets": { "type": "array" },
1010
"imagePullSecret": { "type": "string" },
11+
"serviceAccount": {
12+
"type": "object",
13+
"additionalProperties": false,
14+
"properties": {
15+
"name": { "type": "string" },
16+
"automountServiceAccountToken": { "type": "boolean" }
17+
}
18+
},
1119
"app": { "type": "string" },
1220
"webRoot": { "type": "string" },
1321

‎drupal/values.yaml

+18-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ imagePullSecrets: []
2727
# Custom imagePullSecret for the containers. Base64 encoded. This will create a secret and append it to the imagePullSecrets.
2828
imagePullSecret: ""
2929

30+
serviceAccount:
31+
# Default value: [Release.Name]-sa
32+
name: ""
33+
# Mount service account token to the containers.
34+
automountServiceAccountToken: false
35+
3036
# The app label added to our Kubernetes resources.
3137
app: drupal
3238

@@ -593,6 +599,8 @@ mariadb:
593599
operator: NotIn
594600
values:
595601
- static-ip
602+
serviceAccount:
603+
create: true
596604
enableServiceLinks: false
597605

598606
varnish:
@@ -657,6 +665,10 @@ elasticsearch:
657665
# Disable service links that cause a slow startup.
658666
enableServiceLinks: false
659667

668+
rbac:
669+
create: true
670+
automountToken: false
671+
660672
# This value should be slightly less than 50% of the requested memory.
661673
esJavaOpts: -Xmx220m -Xms220m
662674
xpack:
@@ -687,6 +699,9 @@ elasticsearch:
687699
memcached:
688700
enabled: false
689701
replicaCount: 1
702+
serviceAccount:
703+
create: true
704+
automountServiceAccountToken: false
690705
resources:
691706
requests:
692707
cpu: 10m
@@ -700,7 +715,7 @@ memcached:
700715
# MaxItemSize
701716
- -I 4M
702717

703-
# https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml
718+
# https://github.com/bitnami/charts/blob/d4dba2b393167d79b8c8f65b46c48b70ee3a9662/bitnami/redis/values.yaml
704719
redis:
705720
enabled: false
706721
architecture: standalone
@@ -719,6 +734,8 @@ redis:
719734
requests:
720735
cpu: 50m
721736
memory: 256Mi
737+
serviceAccount:
738+
automountServiceAccountToken: false
722739

723740
# Mailhog service overrides
724741
# see: https://github.com/codecentric/helm-charts/blob/master/charts/mailhog/values.yaml

‎frontend/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ dependencies:
1919
version: 13.2.24
2020
- name: silta-release
2121
repository: file://../silta-release
22-
version: 1.0.0
22+
version: 1.0.1
2323
- name: redis
2424
repository: oci://registry-1.docker.io/bitnamicharts
2525
version: 19.1.5
26-
digest: sha256:b494e7a5c8be4e2c9478ba2af95fa91830a6f537bdafc30c1c1399b4024168c3
27-
generated: "2024-05-02T08:45:24.766124978+03:00"
26+
digest: sha256:17f6538177ebf6ba9e5688e9f5cc9b36598746144336ffc44bbd4a3ecc062c25
27+
generated: "2025-01-21T14:04:37.839887+02:00"

‎frontend/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: frontend
3-
version: 1.12.0
3+
version: 1.13.0
44
dependencies:
55
- name: mariadb
66
version: 7.10.x

0 commit comments

Comments
 (0)