Skip to content

Commit a75ca97

Browse files
djjudas21djjudas21
authored
Merge pull request #199 from djjudas21/jellyfinpriority
Add support for pod priority class
2 parents 65583c5 + 4b7f978 commit a75ca97

File tree

6 files changed

+48
-100
lines changed

6 files changed

+48
-100
lines changed

‎charts/domainmod/values.schema.json‎

Lines changed: 32 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
"description": "environment variables",
2121
"properties": {
2222
"DOMAINMOD_DATABASE": {
23-
"default": "domainmod",
24-
"description": "The name of the database. Set this to whatever you want, but it should match the database name in your database container.",
23+
"default": "",
24+
"description": "The name of the database. You do not need to configure this if you are using the MariaDB Operator integration.",
2525
"title": "DOMAINMOD_DATABASE",
2626
"type": "string"
2727
},
2828
"DOMAINMOD_DATABASE_HOST": {
29-
"default": "domainmod-mariadb",
30-
"description": "The database hostname that DomainMOD should connect to. This needs to be the same name as the datbase container.",
29+
"default": "",
30+
"description": "The database hostname that DomainMOD should connect to. You do not need to configure this if you are using the MariaDB Operator integration.",
3131
"title": "DOMAINMOD_DATABASE_HOST",
3232
"type": "string"
3333
},
3434
"DOMAINMOD_PASSWORD": {
35-
"default": "domainmod",
36-
"description": "The password for DOMAINMOD_USER. Set this to whatever you want, but it should match the database password in your database container.",
35+
"default": "",
36+
"description": "The password for DOMAINMOD_USER. You do not need to configure this if you are using the MariaDB Operator integration.",
3737
"title": "DOMAINMOD_PASSWORD",
3838
"type": "string"
3939
},
4040
"DOMAINMOD_USER": {
41-
"default": "domainmod",
42-
"description": "The name of the database user. Set this to whatever you want, but it should match the database user in your database container.",
41+
"default": "",
42+
"description": "The name of the database user. You do not need to configure this if you are using the MariaDB Operator integration.",
4343
"title": "DOMAINMOD_USER",
4444
"type": "string"
4545
},
@@ -60,52 +60,6 @@
6060
"title": "env",
6161
"type": "object"
6262
},
63-
"externalMariadb": {
64-
"description": "Enable and configure external mariadb database",
65-
"properties": {
66-
"auth": {
67-
"description": "Name of the Kubernetes secret containing the database URI\nfromSecret:\nName of the secret key containing the database URI\nuriKey:",
68-
"properties": {
69-
"database": {
70-
"default": "domainmod",
71-
"title": "database",
72-
"type": "string"
73-
},
74-
"host": {
75-
"default": "",
76-
"title": "host",
77-
"type": "string"
78-
},
79-
"password": {
80-
"default": "",
81-
"title": "password",
82-
"type": "string"
83-
},
84-
"port": {
85-
"default": 3306,
86-
"title": "port",
87-
"type": "integer"
88-
},
89-
"username": {
90-
"default": "",
91-
"title": "username",
92-
"type": "string"
93-
}
94-
},
95-
"required": [],
96-
"title": "auth",
97-
"type": "object"
98-
},
99-
"enabled": {
100-
"default": false,
101-
"title": "enabled",
102-
"type": "boolean"
103-
}
104-
},
105-
"required": [],
106-
"title": "externalMariadb",
107-
"type": "object"
108-
},
10963
"fullnameOverride": {
11064
"default": "",
11165
"title": "fullnameOverride",
@@ -249,37 +203,32 @@
249203
"title": "livenessProbe",
250204
"type": "object"
251205
},
252-
"mariadb": {
253-
"description": "Enable and configure mariadb database subchart under this key.\n For more options see [mariadb chart documentation](https://github.com/bitnami/charts/tree/master/bitnami/mariadb)",
206+
"mariadbOperator": {
207+
"description": "Enable integration with MariaDB Operator\nThis uses the MariaDB Operator (which must be installed\nseparately) to provision a MariaDB instance.",
254208
"properties": {
255-
"architecture": {
256-
"default": "standalone",
257-
"title": "architecture",
258-
"type": "string"
259-
},
260209
"auth": {
261210
"properties": {
262211
"database": {
263212
"default": "domainmod",
264-
"description": "Database name",
213+
"description": "Database name to create",
265214
"title": "database",
266215
"type": "string"
267216
},
268217
"password": {
269218
"default": "domainmod",
270-
"description": "Database password",
219+
"description": "Database password to create",
271220
"title": "password",
272221
"type": "string"
273222
},
274223
"rootPassword": {
275224
"default": "domainmodadminpw",
276-
"description": "Database root password",
225+
"description": "Database root password to create",
277226
"title": "rootPassword",
278227
"type": "string"
279228
},
280229
"username": {
281230
"default": "domainmod",
282-
"description": "Database user",
231+
"description": "Database user to create",
283232
"title": "username",
284233
"type": "string"
285234
}
@@ -290,53 +239,39 @@
290239
},
291240
"enabled": {
292241
"default": false,
242+
"description": "Enable integration with MariaDB Operator",
293243
"title": "enabled",
294244
"type": "boolean"
295245
},
296-
"image": {
246+
"persistence": {
247+
"description": "Persistence settings for MariaDB instance",
297248
"properties": {
298-
"repository": {
299-
"default": "bitnamilegacy/mariadb",
300-
"title": "repository",
249+
"size": {
250+
"default": "1Gi",
251+
"description": "Size of volume to provision for MariaDB instance",
252+
"title": "size",
253+
"type": "string"
254+
},
255+
"storageClass": {
256+
"default": "",
257+
"description": "Storage class to use to provision volume for MariaDB instance",
258+
"title": "storageClass",
301259
"type": "string"
302260
}
303261
},
304262
"required": [],
305-
"title": "image",
263+
"title": "persistence",
306264
"type": "object"
307265
},
308-
"primary": {
309-
"properties": {
310-
"persistence": {
311-
"properties": {
312-
"enabled": {
313-
"default": false,
314-
"title": "enabled",
315-
"type": "boolean"
316-
},
317-
"size": {
318-
"default": "1Gi",
319-
"title": "size",
320-
"type": "string"
321-
}
322-
},
323-
"required": [],
324-
"title": "persistence",
325-
"type": "object"
326-
},
327-
"resources": {
328-
"required": [],
329-
"title": "resources",
330-
"type": "object"
331-
}
332-
},
266+
"resources": {
267+
"description": "Resources for MariaDB instance",
333268
"required": [],
334-
"title": "primary",
269+
"title": "resources",
335270
"type": "object"
336271
}
337272
},
338273
"required": [],
339-
"title": "mariadb",
274+
"title": "mariadbOperator",
340275
"type": "object"
341276
},
342277
"nameOverride": {

‎charts/jellyfin/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
type: application
33
name: jellyfin
44
description: Your media, your server, your way
5-
version: 4.0.2
5+
version: 4.0.3
66
appVersion: 10.11.5
77
kubeVersion: '>=1.20.0-0'
88
home: https://jellyfin.org/
@@ -22,4 +22,4 @@ dependencies: []
2222
annotations:
2323
artifacthub.io/changes: |-
2424
- kind: changed
25-
description: Update to Jellyfin v10.11.5
25+
description: Add support for pod priority class

‎charts/jellyfin/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
](LICENSE)
1919
<br/>
2020
![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
21-
![Version: 4.0.2](https://img.shields.io/badge/Version-4.0.2-informational?style=flat-square)
21+
![Version: 4.0.3](https://img.shields.io/badge/Version-4.0.3-informational?style=flat-square)
2222
![AppVersion: 10.11.5](https://img.shields.io/badge/AppVersion-10.11.5-informational?style=flat-square)
2323

2424
</div>
@@ -135,6 +135,7 @@ The command removes all the Kubernetes components associated with the chart and
135135
| `nodeSelector` | Node labels for pod assignment | `{"kubernetes.io/os":"linux"}` |
136136
| `podAnnotations` | Additional annotations to apply to the pod. | `{}` |
137137
| `podLabels` | Additional labels to be added to pods. | `{}` |
138+
| `priorityClassName` | Pod priority class | `""` |
138139
| `resources.jellyfin.limits` | The resources limits for the container | `{"cpu":"2","memory":"6Gi"}` |
139140
| `resources.jellyfin.requests` | The requested resources for the container | `{"cpu":"500m","memory":"512Mi"}` |
140141
| `strategy` | Set up update strategy for jellyfin installation. Set to `Recreate` if you use persistent volume that cannot be mounted by more than one pods to make sure the pods is destroyed first. ([kubernetes.io/docs](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy)) | `{}` |

‎charts/jellyfin/templates/statefulset.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ spec:
102102
{{- with .Values.tolerations }}
103103
tolerations: {{- toYaml . | nindent 8 }}
104104
{{- end }}
105+
{{- if .Values.priorityClassName }}
106+
priorityClassName: {{ .Values.priorityClassName }}
107+
{{- end }}
105108
volumes:
106109
- name: config
107110
{{- if .Values.persistence.config.enabled }}

‎charts/jellyfin/values.schema.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,12 @@
476476
"title": "podSecurityContext",
477477
"type": "object"
478478
},
479+
"priorityClassName": {
480+
"default": "",
481+
"description": "Pod priority class",
482+
"title": "priorityClassName",
483+
"type": "string"
484+
},
479485
"probes": {
480486
"description": "Health probes for the pod (https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)",
481487
"properties": {

‎charts/jellyfin/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ strategy: {}
5555
nodeSelector:
5656
kubernetes.io/os: linux
5757

58+
# -- Pod priority class
59+
priorityClassName: ""
60+
5861
# expects input structure as per specification
5962
# -- Affinity for pod assignment (https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.26/#affinity-v1-core)
6063
affinity: {}

0 commit comments

Comments
 (0)