Compare commits

..

No commits in common. "d27da07cb42830a14e517ac6d7eb9c474e15a34d" and "3e31d1ff5ebae87587fbf44b3fc9b4212cb64538" have entirely different histories.

5 changed files with 21 additions and 54 deletions

View File

@ -54,13 +54,6 @@ templates:
alias: traefik alias: traefik
values: values:
- '{{ requiredEnv "PWD" }}/values/common/values.tcp-route.yaml' - '{{ requiredEnv "PWD" }}/values/common/values.tcp-route.yaml'
ext-traefik-middleware:
dependencies:
- chart: bedag/raw
version: 2.0.0
alias: middleware
values:
- '{{ requiredEnv "PWD" }}/values/common/values.middleware.yaml'
ext-istio-resource: ext-istio-resource:
dependencies: dependencies:
- chart: bedag/raw - chart: bedag/raw

View File

@ -99,7 +99,6 @@ releases:
version: 0.1.0 version: 0.1.0
inherit: inherit:
- template: default-env-values - template: default-env-values
- template: ext-traefik-middleware
- name: grafana - name: grafana
chart: grafana/grafana chart: grafana/grafana
namespace: applications namespace: applications

View File

@ -1,3 +1,4 @@
---
# -------------------------------------------------- # --------------------------------------------------
# -- Extensions values # -- Extensions values
# -------------------------------------------------- # --------------------------------------------------
@ -26,9 +27,10 @@ traefik:
# -- Main values # -- Main values
# -------------------------------------------------- # --------------------------------------------------
image: image:
#tag: java21-graalvm tag: java21-graalvm
tag: java21-jdk #tag: java21-jdk
pullPolicy: Always pullPolicy: Always
resources: resources:
requests: requests:
memory: 4.5Gi memory: 4.5Gi
@ -58,12 +60,11 @@ readinessProbe:
failureThreshold: 20 failureThreshold: 20
successThreshold: 1 successThreshold: 1
timeoutSeconds: 20 timeoutSeconds: 20
minecraftServer: minecraftServer:
memory: 3584M memory: 3584M
jvmOpts: |
-server
jvmXXOpts: | jvmXXOpts: |
-Xms3584M -Xmx4500M -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:MaxGCPauseMillis=37 -XX:+PerfDisableSharedMem -XX:G1HeapRegionSize=16M -XX:G1NewSizePercent=23 -XX:G1ReservePercent=20 -XX:SurvivorRatio=32 -XX:G1MixedGCCountTarget=3 -XX:G1HeapWastePercent=20 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1RSetUpdatingPauseTimePercent=0 -XX:MaxTenuringThreshold=1 -XX:G1SATBBufferEnqueueingThresholdPercent=30 -XX:G1ConcMarkStepDurationMillis=5.0 -XX:G1ConcRSHotCardLimit=16 -XX:G1ConcRefinementServiceIntervalMillis=150 -XX:GCTimeRatio=99
overrideServerProperties: true overrideServerProperties: true
eula: "TRUE" eula: "TRUE"
onlineMode: false onlineMode: false
@ -76,15 +77,15 @@ minecraftServer:
pvp: true pvp: true
modUrls: [] modUrls: []
serviceType: NodePort serviceType: NodePort
#- https://github.com/CaffeineMC/lithium-fabric/releases/download/mc1.20.1-0.11.2/lithium-fabric-mc1.20.1-0.11.2-api.jar #- https://github.com/CaffeineMC/lithium-fabric/releases/download/mc1.20.1-0.11.2/lithium-fabric-mc1.20.1-0.11.2-api.jar
#- https://github.com/CaffeineMC/sodium-fabric/releases/download/mc1.20.1-0.5.11/sodium-fabric-0.5.11+mc1.20.1.jar #- https://github.com/CaffeineMC/sodium-fabric/releases/download/mc1.20.1-0.5.11/sodium-fabric-0.5.11+mc1.20.1.jar
#- https://github.com/CaffeineMC/lithium-fabric/releases/download/mc1.20.1-0.11.2/lithium-fabric-mc1.20.1-0.11.2.jar #- https://github.com/CaffeineMC/lithium-fabric/releases/download/mc1.20.1-0.11.2/lithium-fabric-mc1.20.1-0.11.2.jar
#pluginUrls: #pluginUrls:
# - https://github.com/dmulloy2/ProtocolLib/releases/download/5.2.0/ProtocolLib.jar # - https://github.com/dmulloy2/ProtocolLib/releases/download/5.2.0/ProtocolLib.jar
# - https://mediafilez.forgecdn.net/files/3789/833/GravityControl-2.0.0.jar # - https://mediafilez.forgecdn.net/files/3789/833/GravityControl-2.0.0.jar
# - https://mediafilez.forgecdn.net/files/3151/915/CrackShot.jar # - https://mediafilez.forgecdn.net/files/3151/915/CrackShot.jar
# - https://s3.badhouseplants.net/public-download/MechanicsCore-3.4.8.jar # - https://s3.badhouseplants.net/public-download/MechanicsCore-3.4.8.jar
# - https://s3.badhouseplants.net/public-download/WeaponMechanics-3.4.9.jar # - https://s3.badhouseplants.net/public-download/WeaponMechanics-3.4.9.jar
rcon: rcon:
enabled: true enabled: true
withGeneratedPassword: false withGeneratedPassword: false
@ -105,7 +106,7 @@ minecraftServer:
enabled: false enabled: false
persistence: persistence:
storageClass: longhorn storageClass: longhorn
#storageClass: local-path #storageClass: local-path
dataDir: dataDir:
enabled: true enabled: true
Size: 9Gi Size: 9Gi
@ -157,7 +158,7 @@ initContainers:
- name: download - name: download
mountPath: /download mountPath: /download
readOnly: false readOnly: false
extraVolumes: extraVolumes:
- volumeMounts: - volumeMounts:
- name: plugins - name: plugins
mountPath: /data/mods mountPath: /data/mods

View File

@ -1,23 +1,16 @@
middleware: ---
enabled: true
middlewares:
- name: navidromeauth
spec:
headers:
customRequestHeaders:
Remote-User: "guest"
shortcuts: shortcuts:
hostname: music.badhouseplants.net hostname: music.badhouseplants.net
ingress: ingress:
main: main:
annotations: annotations:
traefik.ingress.kubernetes.io/router.middlewares: applications-navidromeauth@kubernetescrd
kubernetes.io/ingress.class: traefik kubernetes.io/ingress.class: traefik
kubernetes.io/tls-acme: "true" kubernetes.io/tls-acme: "true"
kubernetes.io/ingress.allow-http: "false" kubernetes.io/ingress.allow-http: "false"
kubernetes.io/ingress.global-static-ip-name: "" kubernetes.io/ingress.global-static-ip-name: ""
cert-manager.io/cluster-issuer: badhouseplants-issuer-http01 cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
traefik.ingress.kubernetes.io/router.entrypoints: web,websecure traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
env: env:
main: main:
enabled: true enabled: true
@ -26,16 +19,9 @@ env:
data: data:
ND_MUSICFOLDER: /app/music ND_MUSICFOLDER: /app/music
ND_DATAFOLDER: /app/data ND_DATAFOLDER: /app/data
ND_LOGLEVEL: info ND_LOGLEVEL: info
ND_BASEURL: 'https://{{ .Values.shortcuts.hostname }}' ND_BASEURL: 'https://{{ .Values.shortcuts.hostname }}'
ND_REVERSEPROXYUSERHEADER: "Remote-User"
ND_REVERSEPROXYWHITELIST: "0.0.0.0/0"
ND_LASTFM_ENABLED: false
ND_LISTENBRAINZ_ENABLED: false
ND_ENABLEUSEREDITING: false
ND_ENABLEFAVOURITES: false
ND_ENABLESTARRATING: false
ND_ENABLEEXTERNALSERVICES: false
files: files:
rclone-config: rclone-config:
enabled: true enabled: true

View File

@ -1,12 +0,0 @@
middleware:
templates:
- |
{{ range .Values.middlewares }}
---
apiVersion: traefik.io/v1alpha1
kind: Middleware
metadata:
name: {{ .name }}
spec:
{{ .spec | toYaml | nindent 4 }}
{{- end }}