Skip to content

Commit 85b581e

Browse files
attilaedelenyiattilaedelenyi
committed
Refactor disk size settings - moved from resources - that place was wrong
1 parent 1f848fa commit 85b581e

27 files changed

Lines changed: 288 additions & 181 deletions

‎charts/ontoserver/README.md‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -514,12 +514,12 @@ The ArgoCD examples use multi-source Applications with both the `ontoserver` and
514514
| `ontoserver.deployment.persistence.enabledForDeployment` | Enable PVC on Deployment | `false` |
515515
| `ontoserver.deployment.persistence.mode` | shared | split - Use one or separate PV for db and lucene files | `split` |
516516
| `ontoserver.deployment.persistence.files.accessMode` | PVC access mode. Use ReadWriteOnce for single instances and StatefulSet scaled deployments (each pod gets its own PVC via volumeClaimTemplates). Shared volumes across pods are not supported — Lucene indexes are pod-local. | `ReadWriteOnce` |
517+
| `ontoserver.deployment.persistence.files.storageSize` | Requested storage size for the Ontoserver files volume | `10Gi` |
517518
| `ontoserver.deployment.persistence.files.existingVolume.enabled` | Bind to existing PV (Deployment only; not supported for StatefulSet) | `false` |
518519
| `ontoserver.deployment.persistence.files.existingVolume.name` | Name of existing PV | `""` |
519520
| `ontoserver.deployment.persistence.files.pv.enabled` | Create a PersistentVolume for the files PVC backed by a pre-provisioned disk (requires existingVolume.enabled and existingVolume.name) | `false` |
520521
| `ontoserver.deployment.persistence.files.pv.diskURI` | CSI volumeHandle — cloud-specific disk identifier (required when enabled, e.g. Azure disk resource ID or EBS volume ID) | `""` |
521522
| `ontoserver.deployment.persistence.files.pv.csiDriver` | CSI driver (required when enabled, e.g. disk.csi.azure.com or ebs.csi.aws.com) | `""` |
522-
| `ontoserver.deployment.persistence.files.pv.storageSize` | Storage capacity | `10Gi` |
523523
| `ontoserver.deployment.persistence.files.pv.storageClassName` | StorageClass name (defaults to RELEASE-ontoserver-files) | `""` |
524524
| `ontoserver.deployment.persistence.files.storageClass.name` | StorageClass name to use when provided.enabled is false; leave empty to use the cluster default StorageClass | `default` |
525525
| `ontoserver.deployment.persistence.files.storageClass.provided.enabled` | Use provided storageClass | `true` |
@@ -529,12 +529,12 @@ The ArgoCD examples use multi-source Applications with both the `ontoserver` and
529529
| `ontoserver.deployment.persistence.files.storageClass.provided.storageParameters.kind` | Storage kind (AKS/Azure specific) | `Managed` |
530530
| `ontoserver.deployment.persistence.files.storageClass.provided.allowVolumeExpansion` | Allow volume expansion | `true` |
531531
| `ontoserver.deployment.persistence.dbfiles.accessMode` | PVC access mode. Use ReadWriteOnce; only relevant for single-instance deployments with sidecar db (scaled deployments require external PostgreSQL and do not use dbfiles). | `ReadWriteOnce` |
532+
| `ontoserver.deployment.persistence.dbfiles.storageSize` | Requested storage size for the database files volume | `10Gi` |
532533
| `ontoserver.deployment.persistence.dbfiles.existingVolume.enabled` | Bind to existing PV (Deployment only; not supported for StatefulSet) | `false` |
533534
| `ontoserver.deployment.persistence.dbfiles.existingVolume.name` | Name of existing PV | `""` |
534535
| `ontoserver.deployment.persistence.dbfiles.pv.enabled` | Create a PersistentVolume for the db-files PVC backed by a pre-provisioned disk (requires existingVolume.enabled and existingVolume.name; only used in split mode with db.enabled) | `false` |
535536
| `ontoserver.deployment.persistence.dbfiles.pv.diskURI` | CSI volumeHandle — cloud-specific disk identifier (required when enabled, e.g. Azure disk resource ID or EBS volume ID) | `""` |
536537
| `ontoserver.deployment.persistence.dbfiles.pv.csiDriver` | CSI driver (required when enabled, e.g. disk.csi.azure.com or ebs.csi.aws.com) | `""` |
537-
| `ontoserver.deployment.persistence.dbfiles.pv.storageSize` | Storage capacity | `10Gi` |
538538
| `ontoserver.deployment.persistence.dbfiles.pv.storageClassName` | StorageClass name (defaults to RELEASE-ontoserver-db-files) | `""` |
539539
| `ontoserver.deployment.persistence.dbfiles.storageClass.name` | StorageClass name to use when provided.enabled is false; leave empty to use the cluster default StorageClass | `default` |
540540
| `ontoserver.deployment.persistence.dbfiles.storageClass.provided.enabled` | Use provided storageClass | `true` |
@@ -568,20 +568,18 @@ The ArgoCD examples use multi-source Applications with both the `ontoserver` and
568568

569569
### Resources
570570

571-
| Name | Description | Value |
572-
| -------------------------------------------------- | ----------------- | ------- |
573-
| `ontoserver.resources.ontoserver.requests.cpu` | CPU request | `2` |
574-
| `ontoserver.resources.ontoserver.requests.memory` | Memory request | `4G` |
575-
| `ontoserver.resources.ontoserver.requests.storage` | Storage request | `10G` |
576-
| `ontoserver.resources.ontoserver.limits.cpu` | CPU limit | `2` |
577-
| `ontoserver.resources.ontoserver.limits.memory` | Memory limit | `4G` |
578-
| `ontoserver.resources.ontoserver.initialHeapSize` | Java initial heap | `2800m` |
579-
| `ontoserver.resources.ontoserver.maxHeapSize` | Java max heap | `2800m` |
580-
| `ontoserver.resources.db.requests.cpu` | DB CPU request | `1` |
581-
| `ontoserver.resources.db.requests.memory` | DB memory request | `1G` |
582-
| `ontoserver.resources.db.requests.storage` | Storage request | `10G` |
583-
| `ontoserver.resources.db.limits.cpu` | DB CPU limit | `1` |
584-
| `ontoserver.resources.db.limits.memory` | DB memory limit | `1G` |
571+
| Name | Description | Value |
572+
| ------------------------------------------------- | ----------------- | ------- |
573+
| `ontoserver.resources.ontoserver.requests.cpu` | CPU request | `2` |
574+
| `ontoserver.resources.ontoserver.requests.memory` | Memory request | `4G` |
575+
| `ontoserver.resources.ontoserver.limits.cpu` | CPU limit | `2` |
576+
| `ontoserver.resources.ontoserver.limits.memory` | Memory limit | `4G` |
577+
| `ontoserver.resources.ontoserver.initialHeapSize` | Java initial heap | `2800m` |
578+
| `ontoserver.resources.ontoserver.maxHeapSize` | Java max heap | `2800m` |
579+
| `ontoserver.resources.db.requests.cpu` | DB CPU request | `1` |
580+
| `ontoserver.resources.db.requests.memory` | DB memory request | `1G` |
581+
| `ontoserver.resources.db.limits.cpu` | DB CPU limit | `1` |
582+
| `ontoserver.resources.db.limits.memory` | DB memory limit | `1G` |
585583

586584
### TLS and Networking
587585

@@ -611,6 +609,7 @@ The ArgoCD examples use multi-source Applications with both the `ontoserver` and
611609
| ------------------------------------------------------------ | -------------------------------------------------------------------------------------------------- | -------------------------------------- |
612610
| `ontoserver.managementService.enabled` | Enable management service (exposes Spring Boot actuator on port 18080) | `false` |
613611
| `ontoserver.metrics.serviceMonitor.enabled` | Enable Prometheus ServiceMonitor (requires managementService.enabled and Prometheus Operator CRDs) | `false` |
612+
| `ontoserver.tests.ttlSecondsAfterFinished` | Time to retain Helm test Jobs after completion so logs remain available | `1800` |
614613
| `ontoserver.opentelemetry.instrumentation.enabled` | Enable OpenTelemetry Java auto-instrumentation (requires OpenTelemetry Operator) | `false` |
615614
| `ontoserver.opentelemetry.instrumentation.image` | Auto-instrumentation agent image | `otel/autoinstrumentation-java:latest` |
616615
| `ontoserver.opentelemetry.instrumentation.serviceName` | OTel service name (defaults to releaseName/releaseName-ontoserver) | `""` |

‎charts/ontoserver/examples/aks/scaled-ro-envoy.yaml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,25 @@
2929
# - cert-manager installed (optional, for TLS)
3030
#
3131
# Usage:
32-
# helm install my-ontoserver ./charts/ontoserver -f aks/scaled-ro-envoy.yaml
32+
# helm install my-ontoserver ./charts/ontoserver -f aks/scaled-ro-envoy.yaml \
33+
# --set ontoserver.imageCredentials.username=<quay-username> \
34+
# --set ontoserver.imageCredentials.password=<quay-password>
3335

3436
ontoserver:
35-
imageCredentials:
36-
username: "" # quay.io username
37-
password: "" # quay.io password
38-
3937
serverName: ontoserver.example.com
4038
hostNames:
4139
- ontoserver.example.com
4240

4341
deployment:
42+
# Image pull auth:
43+
# - preferred for production: create a docker-registry Secret and reference it here
44+
# - alternative: pass ontoserver.imageCredentials.username/password via --set at install time
45+
imagePullSecrets:
46+
- name: ontoserver-quay-pull-secret
4447
kind: StatefulSet
4548
type: scaled
4649
image: quay.io/aehrc/ontoserver:ctsa-6
47-
replicas: 3
50+
replicas: 2
4851
isReadOnly: true
4952

5053
# clusterName scopes Infinispan discovery to this deployment.
@@ -55,12 +58,12 @@ ontoserver:
5558
enabled: false # external PostgreSQL required — sidecar not supported for scaled
5659

5760
persistence:
58-
mode: split
5961
# Azure Disk (Premium_LRS) — ReadWriteOnce per pod. StatefulSet
6062
# volumeClaimTemplates provision a dedicated disk for each pod so
6163
# Lucene indexes are never shared between instances.
6264
files:
6365
accessMode: ReadWriteOnce
66+
storageSize: 50G # per-pod disk for Lucene indexes — size for your terminology set
6467
storageClass:
6568
provided:
6669
enabled: true
@@ -73,7 +76,7 @@ ontoserver:
7376

7477
podDisruptionBudget:
7578
enabled: true
76-
minAvailable: 2 # keep at least 2 instances available during updates
79+
minAvailable: 1 # keep at least 1 instance available during updates
7780

7881
config:
7982
# External PostgreSQL connection — replace with your server details.
@@ -85,21 +88,19 @@ ontoserver:
8588
enabled: true
8689
className: envoy-gateway-class
8790

88-
# ── TLS via cert-manager ──────────────────────────────────────────────────
89-
# tls:
90-
# enabled: true
91-
# certRef: ontoserver-tls
92-
# certmanager:
93-
# enabled: true
94-
# clusterIssuerName: letsencrypt-prod
95-
# email: your-email@example.com
91+
tls:
92+
enabled: true
93+
certRef: ontoserver-tls
94+
certmanager:
95+
enabled: true
96+
clusterIssuerName: letsencrypt-prod
97+
email: your-email@example.com
9698

9799
resources:
98100
ontoserver:
99101
requests:
100102
cpu: 2
101103
memory: 4G
102-
storage: 50G # per-pod disk for Lucene indexes — size for your terminology set
103104
limits:
104105
cpu: 4
105106
memory: 8G

‎charts/ontoserver/examples/aks/scaled-rw-envoy-experimental.yaml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,21 @@
2121
# - Azure Disk CSI driver enabled (default on AKS)
2222
#
2323
# Usage:
24-
# helm install my-ontoserver ./charts/ontoserver -f aks/scaled-rw-envoy-experimental.yaml
24+
# helm install my-ontoserver ./charts/ontoserver -f aks/scaled-rw-envoy-experimental.yaml \
25+
# --set ontoserver.imageCredentials.username=<quay-username> \
26+
# --set ontoserver.imageCredentials.password=<quay-password>
2527

2628
ontoserver:
27-
imageCredentials:
28-
username: "" # quay.io username
29-
password: "" # quay.io password
30-
3129
serverName: ontoserver.example.com
3230
hostNames:
3331
- ontoserver.example.com
3432

3533
deployment:
34+
# Image pull auth:
35+
# - preferred for production: create a docker-registry Secret and reference it here
36+
# - alternative: pass ontoserver.imageCredentials.username/password via --set at install time
37+
imagePullSecrets:
38+
- name: ontoserver-quay-pull-secret
3639
kind: StatefulSet
3740
type: scaled
3841
image: quay.io/aehrc/ontoserver:ctsa-6
@@ -50,6 +53,7 @@ ontoserver:
5053
# volumeClaimTemplates. Each pod has its own dedicated disk.
5154
files:
5255
accessMode: ReadWriteOnce
56+
storageSize: 50G
5357
storageClass:
5458
provided:
5559
enabled: true
@@ -73,7 +77,6 @@ ontoserver:
7377
requests:
7478
cpu: 2
7579
memory: 4G
76-
storage: 50G
7780
limits:
7881
cpu: 4
7982
memory: 8G

‎charts/ontoserver/examples/aks/sidecar-db/single-ro-envoy.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,21 @@
1818
# helm install cert-manager jetstack/cert-manager --set crds.enabled=true
1919
#
2020
# Usage:
21-
# helm install my-ontoserver ./charts/ontoserver -f aks/sidecar-db/single-ro-envoy.yaml
21+
# helm install my-ontoserver ./charts/ontoserver -f aks/sidecar-db/single-ro-envoy.yaml \
22+
# --set ontoserver.imageCredentials.username=<quay-username> \
23+
# --set ontoserver.imageCredentials.password=<quay-password>
2224

2325
ontoserver:
24-
imageCredentials:
25-
username: "" # quay.io username
26-
password: "" # quay.io password
27-
2826
serverName: ontoserver.example.com
2927
hostNames:
3028
- ontoserver.example.com
3129

3230
deployment:
31+
# Image pull auth:
32+
# - preferred for production: create a docker-registry Secret and reference it here
33+
# - alternative: pass ontoserver.imageCredentials.username/password via --set at install time
34+
imagePullSecrets:
35+
- name: ontoserver-quay-pull-secret
3336
kind: Deployment
3437
type: single
3538
image: quay.io/aehrc/ontoserver:ctsa-6
@@ -46,6 +49,7 @@ ontoserver:
4649
# Azure Disk (Premium_LRS) — ReadWriteOnce, backed by Azure managed disks.
4750
files:
4851
accessMode: ReadWriteOnce
52+
storageSize: 20G
4953
storageClass:
5054
provided:
5155
enabled: true
@@ -57,6 +61,7 @@ ontoserver:
5761
kind: Managed
5862
dbfiles:
5963
accessMode: ReadWriteOnce
64+
storageSize: 10G
6065
storageClass:
6166
provided:
6267
enabled: true
@@ -85,7 +90,6 @@ ontoserver:
8590
requests:
8691
cpu: 2
8792
memory: 4G
88-
storage: 20G
8993
limits:
9094
cpu: 2
9195
memory: 4G
@@ -95,7 +99,6 @@ ontoserver:
9599
requests:
96100
cpu: 1
97101
memory: 1G
98-
storage: 10G
99102
limits:
100103
cpu: 1
101104
memory: 1G

0 commit comments

Comments
 (0)