From 807b1866a826dbc0a21ec39b2d50d3a53e6b45ef Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Sat, 20 Feb 2021 12:16:05 -0500
Subject: [PATCH] set memory requirements to avoid sudden container death

---
 helm/templates/deploy.yaml |  8 ++++----
 helm/values.yaml           |  0
 values-camcraft.yaml       | 42 ++++++++++++++++++++++++++++++++++++++
 values-minecraft.yaml      |  4 ++--
 values-pubcraft.yaml       |  4 ++--
 values-testcraft.yaml      |  6 +++---
 6 files changed, 53 insertions(+), 11 deletions(-)
 delete mode 100644 helm/values.yaml
 create mode 100644 values-camcraft.yaml

diff --git a/helm/templates/deploy.yaml b/helm/templates/deploy.yaml
index d838d91..0f57ddb 100644
--- a/helm/templates/deploy.yaml
+++ b/helm/templates/deploy.yaml
@@ -31,14 +31,14 @@ spec:
         - name: MAX_RAM
           value: {{ .Values.max_ram | quote }}
         - name: MIN_RAM
-          value: {{ .Values.min_ram | quote }}
+          value: {{ .Values.max_ram | quote }}
         resources:
           requests:
-            memory: {{ .Values.min_ram }}Gi
-            cpu: 250m
+            memory: {{ .Values.max_ram }}Gi
+            cpu: 1m
           limits:
             memory: {{ .Values.max_ram }}Gi
-            cpu: "4"
+            cpu: {{ .Values.max_cpu | quote }}
       volumes:
       - name: data
         persistentVolumeClaim:
diff --git a/helm/values.yaml b/helm/values.yaml
deleted file mode 100644
index e69de29..0000000
diff --git a/values-camcraft.yaml b/values-camcraft.yaml
new file mode 100644
index 0000000..d6fde33
--- /dev/null
+++ b/values-camcraft.yaml
@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 20101
+max_cpu: 8
+max_ram: 6
+server_props: |
+  max-tick-time=60000
+  generator-settings=
+  force-gamemode=false
+  allow-nether=true
+  gamemode=0
+  broadcast-console-to-ops=true
+  enable-query=false
+  player-idle-timeout=0
+  difficulty=3
+  spawn-monsters=true
+  op-permission-level=4
+  pvp=true
+  snooper-enabled=true
+  level-type=default
+  hardcore=false
+  enable-command-block=false
+  max-players=20
+  network-compression-threshold=256
+  resource-pack-sha1=
+  max-world-size=29999984
+  server-port=25565
+  server-ip=
+  spawn-npcs=true
+  allow-flight=true
+  level-name=world
+  view-distance=32
+  resource-pack=
+  spawn-animals=true
+  white-list=true
+  generate-structures=true
+  online-mode=true
+  max-build-height=256
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false
\ No newline at end of file
diff --git a/values-minecraft.yaml b/values-minecraft.yaml
index d667c00..f06240a 100644
--- a/values-minecraft.yaml
+++ b/values-minecraft.yaml
@@ -1,7 +1,7 @@
 image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
 port: 25565
-max_ram: 5
-min_ram: 1
+max_cpu: 8
+max_ram: 6
 server_props: |
   max-tick-time=60000
   generator-settings=
diff --git a/values-pubcraft.yaml b/values-pubcraft.yaml
index 6285ae9..5b5583d 100644
--- a/values-pubcraft.yaml
+++ b/values-pubcraft.yaml
@@ -1,7 +1,7 @@
 image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
 port: 20100
-max_ram: 8
-min_ram: 1
+max_cpu: 8
+max_ram: 6
 server_props: |
   max-tick-time=60000
   generator-settings=
diff --git a/values-testcraft.yaml b/values-testcraft.yaml
index f175b3b..38f3966 100644
--- a/values-testcraft.yaml
+++ b/values-testcraft.yaml
@@ -1,7 +1,7 @@
 image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
 port: 25566
-max_ram: 5
-min_ram: 1
+max_cpu: 8
+max_ram: 6
 server_props: |
   max-tick-time=60000
   generator-settings=
@@ -28,7 +28,7 @@ server_props: |
   spawn-npcs=true
   allow-flight=true
   level-name=world
-  view-distance=32
+  view-distance=64
   resource-pack=
   spawn-animals=true
   white-list=true