diff --git a/installations/storage/helmfile.yaml b/installations/storage/helmfile.yaml index e1b5d87..2df12d0 100644 --- a/installations/storage/helmfile.yaml +++ b/installations/storage/helmfile.yaml @@ -8,6 +8,9 @@ repositories: url: https://charts.longhorn.io - name: rook-release url: https://charts.rook.io/release + - name: local-path-provisioner + url: git+https://github.com/rancher/local-path-provisioner@deploy/chart?ref=v0.0.28 + releases: - name: rook-ceph chart: rook-release/rook-ceph @@ -36,3 +39,11 @@ releases: - template: default-env-values - template: default-env-secrets - template: ext-secret + + - name: local-path-provisioner + chart: local-path-provisioner/local-path-provisioner + installed: false + createNamespace: false + namespace: kube-system + inherit: + - template: default-env-values diff --git a/values/badhouseplants/values.minecraft.yaml b/values/badhouseplants/values.minecraft.yaml index 63a1f1a..92bbc7b 100644 --- a/values/badhouseplants/values.minecraft.yaml +++ b/values/badhouseplants/values.minecraft.yaml @@ -27,21 +27,22 @@ traefik: # -- Main values # -------------------------------------------------- image: - tag: java17-graalvm + #tag: java21-graalvm + tag: java21 pullPolicy: Always resources: requests: - memory: 3Gi - cpu: 1000m + memory: 3.5Gi + cpu: 1 limits: - memory: 3Gi + memory: 3.5Gi + cpu: 2 #lifecycle: # postStart: # - bash # - -c - # - for i in {1..100}; do mc-health && break || sleep 20; done && rcon-cli setpassword 11223345 livenessProbe: command: @@ -61,16 +62,17 @@ readinessProbe: timeoutSeconds: 20 minecraftServer: - memory: 2G + memory: 3072M + jvmXXOpts: "-Xms3072M -Xmx3072M --add-modules=jdk.incubator.vector -XX:+UseG1GC" overrideServerProperties: true eula: "TRUE" onlineMode: false difficulty: hard - hardcore: true - version: 1.20.1 + hardcore: false + version: "1.20.1" maxWorldSize: 90000 - type: "FORGE" - gameMode: survival + type: "PAPER" + gameMode: creative pvp: true rcon: enabled: true @@ -92,6 +94,7 @@ minecraftServer: enabled: false persistence: storageClass: ceph-filesystem + #storageClass: local-path dataDir: enabled: true Size: 10Gi @@ -117,41 +120,41 @@ mcbackup: # --------------------------------------------- # -- Install Plugins # --------------------------------------------- -initContainers: - - name: 0-download-mods - image: alpine/curl - command: - - curl - - -L - - "https://s3.badhouseplants.net/public-download/server_mods.tar" - - -o - - /download/server_mods.tar - volumeMounts: - - name: download - mountPath: /download - readOnly: false - - name: 1-copy-plugins-to-minecraft - image: ubuntu - command: - - sh - - -c - - cd /mods && tar -xvf /download/server_mods.tar || true - volumeMounts: - - name: plugins - mountPath: /mods - readOnly: false - - name: download - mountPath: /download - readOnly: false -extraVolumes: - - volumeMounts: - - name: plugins - mountPath: /data/mods - readOnly: false - volumes: - - name: plugins - emptyDir: - sizeLimit: 500Mi - - name: download - emptyDir: - sizeLimit: 500Mi +initContainers: {} + # - name: 0-download-mods + # image: alpine/curl + # command: + # - curl + # - -L + # - "https://s3.badhouseplants.net/public-download/server_mods.tar" + # - -o + # - /download/server_mods.tar + # volumeMounts: + # - name: download + # mountPath: /download + # readOnly: false + # - name: 1-copy-plugins-to-minecraft + # image: ubuntu + # command: + # - sh + # - -c + # - cd /mods && tar -xvf /download/server_mods.tar || true + # volumeMounts: + # - name: plugins + # mountPath: /mods + # readOnly: false + # - name: download + # mountPath: /download + # readOnly: false +extraVolumes: {} + # - volumeMounts: + # - name: plugins + # mountPath: /data/mods + # readOnly: false + # volumes: + # - name: plugins + # emptyDir: + # sizeLimit: 500Mi + # - name: download + # emptyDir: + # sizeLimit: 500Mi diff --git a/values/badhouseplants/values.rook-ceph-cluster.yaml b/values/badhouseplants/values.rook-ceph-cluster.yaml index edbc269..b6f0e95 100644 --- a/values/badhouseplants/values.rook-ceph-cluster.yaml +++ b/values/badhouseplants/values.rook-ceph-cluster.yaml @@ -76,15 +76,14 @@ cephClusterSpec: memory: "512Mi" mon: limits: - cpu: "2000m" - memory: "1024Mi" + memory: "512Mi" requests: cpu: "300m" - memory: "128Mi" + memory: "512Mi" osd: requests: cpu: "500m" - memory: "512Mi" + memory: "1280Mi" limits: memory: "1280Mi" #limits: