Skip to content

Commit bb6f9c5

Browse files
authored
Merge pull request #504 from wunderio/release/2025-10-14
Release 2025.10.14
2 parents e6613fc + c907b81 commit bb6f9c5

4 files changed

Lines changed: 45 additions & 4 deletions

File tree

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
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.25.16", "v1.26.15", "v1.27.16", "v1.28.15", "v1.29.14", "v1.30.14", "v1.31.12", "v1.32.8", "latest"]
25+
kubernetes-version: ["v1.28.15", "v1.29.14", "v1.30.14", "v1.31.12", "v1.32.8", "latest"]
2626
env:
2727
CLUSTER_DOMAIN: minikube.local.wdr.io
2828
K8S_PROJECT_REPO_DIR: k8s-project-repositories

drupal/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: drupal
3-
version: 1.26.0
3+
version: 1.27.0
44
dependencies:
55
- name: mariadb
66
version: 7.5.x

drupal/templates/solr-statefulset.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,12 @@ spec:
8383
volumeClaimTemplates:
8484
- metadata:
8585
name: {{ .Release.Name }}-solr-data
86+
{{- if or (eq .Values.solr.persistence.data.storageClassName "silta-shared") (eq .Values.solr.persistence.data.storageClassName "nfs-shared") }}
87+
annotations:
88+
storage.silta/storage-path: {{ .Values.environmentName | default .Release.Name }}/solr-data
89+
{{- end }}
8690
spec:
87-
accessModes: [ "ReadWriteOnce" ]
91+
accessModes: {{ .Values.solr.persistence.data.accessModes }}
8892
{{- if .Values.solr.persistence.data.storageClassName }}
8993
storageClassName: {{ .Values.solr.persistence.data.storageClassName }}
9094
{{- else if eq .Values.cluster.type "gke" }}
@@ -96,5 +100,4 @@ spec:
96100
resources:
97101
requests:
98102
storage: {{ .Values.solr.persistence.data.size }}
99-
accessModes: {{ .Values.solr.persistence.data.accessModes }}
100103
{{- end }}

drupal/tests/solr_test.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
suite: solr
2+
templates:
3+
- solr-statefulset.yaml
4+
- solr-service.yaml
5+
capabilities:
6+
apiVersions:
7+
- pxc.percona.com/v1
8+
tests:
9+
- it: storage path annotation is not set by default
10+
template: solr-statefulset.yaml
11+
set:
12+
solr:
13+
enabled: true
14+
asserts:
15+
- notExists:
16+
path: spec.volumeClaimTemplates[0].metadata.annotations['storage.silta/storage-path']
17+
- it: storage path annotation set if silta-shared storage class used
18+
template: solr-statefulset.yaml
19+
set:
20+
solr:
21+
enabled: true
22+
persistence:
23+
data:
24+
storageClassName: silta-shared
25+
asserts:
26+
- exists:
27+
path: spec.volumeClaimTemplates[0].metadata.annotations['storage.silta/storage-path']
28+
- it: storage path annotation set if nfs-shared storage class used
29+
template: solr-statefulset.yaml
30+
set:
31+
solr:
32+
enabled: true
33+
persistence:
34+
data:
35+
storageClassName: nfs-shared
36+
asserts:
37+
- exists:
38+
path: spec.volumeClaimTemplates[0].metadata.annotations['storage.silta/storage-path']

0 commit comments

Comments
 (0)