Update minecraft configuration

common/templates.yaml

@@ -54,6 +54,13 @@ templates:
         alias: traefik
     values:
       - '{{ 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:
     dependencies:
       - chart: bedag/raw

installations/applications/helmfile.yaml

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

values/badhouseplants/values.minecraft.yaml

@@ -1,4 +1,3 @@
----
 # --------------------------------------------------
 # -- Extensions values
 # --------------------------------------------------
@@ -27,10 +26,9 @@ traefik:
 # -- Main values
 # --------------------------------------------------
 image:
-  tag: java21-graalvm
+  #tag: java21-graalvm
-  #tag: java21-jdk
+  tag: java21-jdk
   pullPolicy: Always
-
 resources:
   requests:
     memory: 4.5Gi
@@ -60,11 +58,12 @@ readinessProbe:
   failureThreshold: 20
   successThreshold: 1
   timeoutSeconds: 20
-
 minecraftServer:
   memory: 3584M
+  jvmOpts: |
+    -server
   jvmXXOpts: |
-    -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
+    -Xms3584M -Xmx4500M -XX:+UseG1GC
   overrideServerProperties: true
   eula: "TRUE"
   onlineMode: false
@@ -77,15 +76,15 @@ minecraftServer:
   pvp: true
   modUrls: []
   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:
     enabled: true
     withGeneratedPassword: false
@@ -106,7 +105,7 @@ minecraftServer:
         enabled: false
 persistence:
   storageClass: longhorn
-    #storageClass: local-path 
+  #storageClass: local-path
   dataDir:
     enabled: true
     Size: 9Gi
@@ -158,7 +157,7 @@ initContainers:
       - name: download
         mountPath: /download
         readOnly: false
-extraVolumes: 
+extraVolumes:
   - volumeMounts:
       - name: plugins
         mountPath: /data/mods

values/badhouseplants/values.navidrome.yaml

@@ -1,16 +1,23 @@
----
+middleware:
+  enabled: true
+  middlewares:
+    - name: navidromeauth
+      spec:
+        headers:
+          customRequestHeaders:
+            Remote-User: "guest"
 shortcuts:
   hostname: music.badhouseplants.net
 ingress:
   main:
     annotations:
+      traefik.ingress.kubernetes.io/router.middlewares: applications-navidromeauth@kubernetescrd
       kubernetes.io/ingress.class: traefik
       kubernetes.io/tls-acme: "true"
       kubernetes.io/ingress.allow-http: "false"
       kubernetes.io/ingress.global-static-ip-name: ""
       cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
       traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
-
 env:
   main:
     enabled: true
@@ -19,9 +26,16 @@ env:
     data:
       ND_MUSICFOLDER: /app/music
       ND_DATAFOLDER: /app/data
-      ND_LOGLEVEL: info      
+      ND_LOGLEVEL: info
       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:
   rclone-config:
     enabled: true

values/common/values.middleware.yaml

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