Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make jvm config easier to customize #204

Merged
merged 4 commits into from
Jun 13, 2024
Merged

Make jvm config easier to customize #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fad34a
Make jvm config easier to customize
ndrluis Jun 5, 2024
47228cd
Update k8s versions
valeriano-manassero Jun 13, 2024
7605a4f
Support 1.30
valeriano-manassero Jun 13, 2024
56c9707
Support 1.30
valeriano-manassero Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ jobs:
strategy:
matrix:
k8s:
- v1.25.11
- v1.26.6
- v1.27.3
- v1.28.0
- v1.28.9
- v1.29.4
- v1.30.0
steps:
- name: Checkout
uses: actions/checkout@v3.5.0
Expand Down
8 changes: 5 additions & 3 deletions valeriano-manassero/trino/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v1
appVersion: "433"
description: High performance, distributed SQL query engine for big data
name: trino
version: 9.3.0
kubeVersion: ">= 1.24.0-0 < 1.29.0-0"
version: 10.0.0
kubeVersion: ">= 1.24.0-0 < 1.31.0-0"
home: https://trino.io
icon: https://trino.io/assets/images/trino-logo/trino-ko_tiny-alt.svg
sources:
Expand All @@ -27,4 +27,6 @@ keywords:
annotations:
artifacthub.io/changes: |
- kind: changed
description: Add ability to adjust logging level of any package.
description: Reduce default jvm configuration to make easier to customize
- kind: changed
description: Increase kubernetes version support
10 changes: 5 additions & 5 deletions valeriano-manassero/trino/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# trino

![Version: 9.3.0](https://img.shields.io/badge/Version-9.3.0-informational?style=flat-square) ![AppVersion: 433](https://img.shields.io/badge/AppVersion-433-informational?style=flat-square)
![Version: 10.0.0](https://img.shields.io/badge/Version-10.0.0-informational?style=flat-square) ![AppVersion: 433](https://img.shields.io/badge/AppVersion-433-informational?style=flat-square)

High performance, distributed SQL query engine for big data

Expand All @@ -19,7 +19,7 @@ High performance, distributed SQL query engine for big data

## Requirements

Kubernetes: `>= 1.24.0-0 < 1.29.0-0`
Kubernetes: `>= 1.24.0-0 < 1.31.0-0`

## Values

Expand All @@ -37,7 +37,7 @@ Kubernetes: `>= 1.24.0-0 < 1.29.0-0`
| config.coordinator.jvm.gcMethod.g1.heapRegionSize | string | `"32M"` | |
| config.coordinator.jvm.gcMethod.type | string | `"UseG1GC"` | |
| config.coordinator.jvm.maxRAMPercentage | float | `80` | |
| config.coordinator.jvmExtraConfig | string | `""` | |
| config.coordinator.jvmExtraConfig | string | `"-agentpath:/usr/lib/trino/bin/libjvmkill.so\n-XX:+ExplicitGCInvokesConcurrent\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:+ExitOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:ReservedCodeCacheSize=512M\n-XX:PerMethodRecompilationCutoff=10000\n-XX:PerBytecodeRecompilationCutoff=10000\n-Djdk.attach.allowAttachSelf=true\n-Djdk.nio.maxCachedBufferSize=2000000\n-XX:+UnlockDiagnosticVMOptions\n-XX:G1NumCollectionsKeepPinned=10000000"` | |
| config.coordinator.nodeSelector | object | `{}` | |
| config.coordinator.podAnnotations | object | `{}` | |
| config.coordinator.podLabels | object | `{}` | |
Expand Down Expand Up @@ -79,7 +79,7 @@ Kubernetes: `>= 1.24.0-0 < 1.29.0-0`
| config.worker.jvm.gcMethod.g1.heapRegionSize | string | `"32M"` | |
| config.worker.jvm.gcMethod.type | string | `"UseG1GC"` | |
| config.worker.jvm.maxRAMPercentage | float | `80` | |
| config.worker.jvmExtraConfig | string | `""` | |
| config.worker.jvmExtraConfig | string | `"-agentpath:/usr/lib/trino/bin/libjvmkill.so\n-XX:+ExplicitGCInvokesConcurrent\n-XX:+HeapDumpOnOutOfMemoryError\n-XX:+ExitOnOutOfMemoryError\n-XX:-OmitStackTraceInFastThrow\n-XX:ReservedCodeCacheSize=512M\n-XX:PerMethodRecompilationCutoff=10000\n-XX:PerBytecodeRecompilationCutoff=10000\n-Djdk.attach.allowAttachSelf=true\n-Djdk.nio.maxCachedBufferSize=2000000\n-XX:+UnlockDiagnosticVMOptions\n-XX:G1NumCollectionsKeepPinned=10000000"` | |
| config.worker.lifecycle | object | `{}` | |
| config.worker.nodeSelector | object | `{}` | |
| config.worker.podAnnotations | object | `{}` | |
Expand All @@ -98,7 +98,7 @@ Kubernetes: `>= 1.24.0-0 < 1.29.0-0`
| groupProvider | object | `{}` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"trinodb/trino"` | |
| image.tag | int | `433` | |
| image.tag | int | `449` | |
| imagePullSecrets | list | `[]` | |
| ingress.annotations | object | `{}` | |
| ingress.enabled | bool | `false` | |
Expand Down
11 changes: 0 additions & 11 deletions valeriano-manassero/trino/templates/configmap-coordinator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,10 @@ data:
jvm.config: |
-server
-agentpath:/usr/lib/trino/bin/libjvmkill.so
-XX:InitialRAMPercentage={{ .Values.config.coordinator.jvm.maxRAMPercentage }}
-XX:MaxRAMPercentage={{ .Values.config.coordinator.jvm.maxRAMPercentage }}
-XX:+{{ .Values.config.coordinator.jvm.gcMethod.type }}
-XX:G1HeapRegionSize={{ .Values.config.coordinator.jvm.gcMethod.g1.heapRegionSize }}
-XX:+ExplicitGCInvokesConcurrent
-XX:+HeapDumpOnOutOfMemoryError
-XX:+ExitOnOutOfMemoryError
-XX:-OmitStackTraceInFastThrow
-XX:ReservedCodeCacheSize=512M
-XX:PerMethodRecompilationCutoff=10000
-XX:PerBytecodeRecompilationCutoff=10000
-Djdk.attach.allowAttachSelf=true
-Djdk.nio.maxCachedBufferSize=2000000
-XX:+UnlockDiagnosticVMOptions
{{- if .Values.jmxExporter.coordinator.enabled }}
-javaagent:{{ .Values.jmxExporter.path }}/lib/{{ .Values.jmxExporter.jarfile }}={{ .Values.jmxExporter.port }}:{{ .Values.jmxExporter.path }}/etc/trino.yaml
{{- end }}
Expand Down
10 changes: 0 additions & 10 deletions valeriano-manassero/trino/templates/configmap-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,6 @@ data:
-XX:MaxRAMPercentage={{ .Values.config.worker.jvm.maxRAMPercentage }}
-XX:+{{ .Values.config.worker.jvm.gcMethod.type }}
-XX:G1HeapRegionSize={{ .Values.config.worker.jvm.gcMethod.g1.heapRegionSize }}
-XX:+ExplicitGCInvokesConcurrent
-XX:+HeapDumpOnOutOfMemoryError
-XX:+ExitOnOutOfMemoryError
-XX:-OmitStackTraceInFastThrow
-XX:ReservedCodeCacheSize=512M
-XX:PerMethodRecompilationCutoff=10000
-XX:PerBytecodeRecompilationCutoff=10000
-Djdk.attach.allowAttachSelf=true
-Djdk.nio.maxCachedBufferSize=2000000
-XX:+UnlockDiagnosticVMOptions
{{- if .Values.jmxExporter.worker.enabled }}
-javaagent:{{ .Values.jmxExporter.path }}/lib/{{ .Values.jmxExporter.jarfile }}={{ .Values.jmxExporter.port }}:{{ .Values.jmxExporter.path }}/etc/trino.yaml
{{- end }}
Expand Down
30 changes: 27 additions & 3 deletions valeriano-manassero/trino/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: trinodb/trino
tag: 433
tag: 449
pullPolicy: IfNotPresent

fullnameOverride: trino
Expand Down Expand Up @@ -84,7 +84,19 @@ config:
type: "UseG1GC"
g1:
heapRegionSize: "32M"
jvmExtraConfig: ""
jvmExtraConfig: |-
-agentpath:/usr/lib/trino/bin/libjvmkill.so
-XX:+ExplicitGCInvokesConcurrent
-XX:+HeapDumpOnOutOfMemoryError
-XX:+ExitOnOutOfMemoryError
-XX:-OmitStackTraceInFastThrow
-XX:ReservedCodeCacheSize=512M
-XX:PerMethodRecompilationCutoff=10000
-XX:PerBytecodeRecompilationCutoff=10000
-Djdk.attach.allowAttachSelf=true
-Djdk.nio.maxCachedBufferSize=2000000
-XX:+UnlockDiagnosticVMOptions
-XX:G1NumCollectionsKeepPinned=10000000
extraConfig: ""
query:
maxMemoryPerNode: "1GB"
Expand Down Expand Up @@ -117,7 +129,19 @@ config:
type: "UseG1GC"
g1:
heapRegionSize: "32M"
jvmExtraConfig: ""
jvmExtraConfig: |-
-agentpath:/usr/lib/trino/bin/libjvmkill.so
-XX:+ExplicitGCInvokesConcurrent
-XX:+HeapDumpOnOutOfMemoryError
-XX:+ExitOnOutOfMemoryError
-XX:-OmitStackTraceInFastThrow
-XX:ReservedCodeCacheSize=512M
-XX:PerMethodRecompilationCutoff=10000
-XX:PerBytecodeRecompilationCutoff=10000
-Djdk.attach.allowAttachSelf=true
-Djdk.nio.maxCachedBufferSize=2000000
-XX:+UnlockDiagnosticVMOptions
-XX:G1NumCollectionsKeepPinned=10000000
extraConfig: ""
query:
maxMemoryPerNode: "1GB"
Expand Down
Loading