Fix RAM issue with deploy

A deploy was running the same max ram for both the pod and the java
app. This led to issues where the java app would use its max ram and the
pod would think it was out of memory. It would kill the pod and the
minecraft server with it, often not saving the last few minutes of
progress.

Now the deploy runs 1GiB extra ram than the java app.

Dockerfile

@@ -2,10 +2,11 @@ FROM openjdk:8-slim
 
 COPY server.jar /server.jar
 
-RUN groupadd -r minecraft && useradd --no-log-init -r -g minecraft minecraft
+RUN groupadd -r minecraft -g 2000
+RUN useradd --no-log-init minecraft -u 2000 -g 2000 -m
 WORKDIR /mc_data
 RUN chown -R minecraft:minecraft .
 
 USER minecraft
 # Copy files only if they don't yet exist (server.jar, server.properties, etc) and start the server
-CMD java -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar /server.jar nogui
+CMD java -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar /server.jar nogui

docker-compose.yaml

@@ -3,4 +3,4 @@ version: '3'
 services:
   minecraft:
     build: .
-    image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_3
+    image: hub.ducoterra.net/ducoterra/minecraft:1.16.4

helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: minecraft
-description: Personal Minecraft Server
+description: A Minecraft server for kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.16
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16
+appVersion: 1.16.4

helm/README.md

@@ -0,0 +1,3 @@
+# Minecraft Server
+
+Creates a vanilla Minecraft server.

helm/app-readme.md

@@ -0,0 +1,3 @@
+# Minecraft Server
+
+Creates a vanilla Minecraft server.

helm/ix_values.yaml

@@ -0,0 +1 @@
+image: ducoterra/minecraft:1.16.4

helm/questions.yaml

@@ -0,0 +1,30 @@
+groups:
+  - name: "Server Config"
+    description: "Minecraft Server Configuration"
+  - name: "Storage"
+    description: "Minecraft Server Storage"
+questions:
+  - variable: port
+    description: "Listen Port"
+    group: "Server Config"
+    label: "Port"
+    schema:
+      type: int
+      default: 25565
+      required: true
+  - variable: max_ram
+    description: "Total RAM allocated to the server"
+    group: "Server Config"
+    label: "RAM Limit (GiB)"
+    schema:
+      type: int
+      default: 4
+      required: true
+  - variable: max_cpu
+    description: "# CPU Cores Allocated to the server"
+    group: "Server Config"
+    label: "CPU Limit (# Cores)"
+    schema:
+      type: int
+      default: 4
+      required: true

helm/templates/configmap.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}
+data:
+  eula.txt: |
+    eula=true
+  server.properties: {{ toYaml .Values.server_props | indent 2 }}

helm/templates/deploy.yaml

@@ -6,6 +6,8 @@ spec:
   selector:
     matchLabels:
       app: {{ .Release.Name }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -29,20 +31,22 @@ spec:
         stdin: true
         env:
         - name: MAX_RAM
-          value: "4"
+          value: {{ .Values.max_ram | quote }}
         - name: MIN_RAM
           value: "1"
         resources:
           requests:
-            memory: "2Gi"
-            cpu: 250m
+            memory: {{ div .Values.max_ram 2 }}Gi
+            cpu: 1m
           limits:
-            memory: "8Gi"
-            cpu: "4"
+            memory: {{ add 1 .Values.max_ram }}Gi
+            cpu: {{ .Values.max_cpu | quote }}
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: {{ .Release.Name }}
       - name: properties
         configMap:
-          name: {{ .Release.Name }}
+          name: {{ .Release.Name }}
+      securityContext:
+        fsGroup: 2000

helm/templates/pvc.yaml

@@ -5,7 +5,6 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 spec:
-  storageClassName: nvme
   accessModes:
     - ReadWriteOnce
   resources:

helm/values.yaml

@@ -0,0 +1,42 @@
+image: ducoterra/minecraft:1.16.4
+port: 20101
+max_cpu: 4
+max_ram: 4
+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

minecraft/templates/configmap.yaml

@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}
-data:
-  eula.txt: |
-    eula=true
-  server.properties: |
-    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

minecraft/templates/deploy.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}
-    spec:
-      containers:
-      - name: {{ .Release.Name }}
-        image: {{ .Values.image }}:{{ .Values.tag }}
-        ports:
-        - containerPort: 25565
-        volumeMounts:
-        - mountPath: /mc_data
-          name: data
-        - name: properties
-          mountPath: /mc_data/server.properties
-          subPath: server.properties
-        - name: properties
-          mountPath: /mc_data/eula.txt
-          subPath: eula.txt
-        tty: true
-        stdin: true
-        env:
-        - name: MAX_RAM
-          value: "4"
-        - name: MIN_RAM
-          value: "1"
-        - name: THREADS
-          value: "4"
-        resources:
-          requests:
-            memory: "2Gi"
-            cpu: 250m
-          limits:
-            memory: "8Gi"
-            cpu: "4"
-      volumes:
-      - name: data
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}
-      - name: properties
-        configMap:
-          name: {{ .Release.Name }}

minecraft/templates/pvc.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Release.Name }}
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  storageClassName: nvme
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 32Gi

minecraft/values.yaml

@@ -1,3 +0,0 @@
-image: hub.ducoterra.net/ducoterra/minecraft
-tag: 1.16.1_2
-port: 25565

pubcraft/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

pubcraft/Chart.yaml

@@ -1,23 +0,0 @@
-apiVersion: v2
-name: charts
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16.0

pubcraft/templates/configmap.yaml

@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}
-data:
-  eula.txt: |
-    eula=true
-  server.properties: |
-    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

pubcraft/templates/deploy.yaml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}
-    spec:
-      containers:
-      - name: {{ .Release.Name }}
-        image: {{ .Values.image }}
-        ports:
-        - containerPort: 25565
-        volumeMounts:
-        - mountPath: /mc_data
-          name: data
-        - name: properties
-          mountPath: /mc_data/server.properties
-          subPath: server.properties
-        - name: properties
-          mountPath: /mc_data/eula.txt
-          subPath: eula.txt
-        tty: true
-        stdin: true
-        env:
-        - name: MAX_RAM
-          value: "4"
-        - name: MIN_RAM
-          value: "1"
-        - name: THREADS
-          value: "4"
-        resources:
-          requests:
-            memory: "2Gi"
-            cpu: 250m
-          limits:
-            memory: "8Gi"
-            cpu: "4"
-      volumes:
-      - name: data
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}
-      - name: properties
-        configMap:
-          name: {{ .Release.Name }}

pubcraft/templates/service.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    app: {{ .Release.Name }}
-  ports:
-  - port: {{ .Values.port }}
-    targetPort: 25565
-    name: {{ .Release.Name }}
-  type: LoadBalancer

pubcraft/values.yaml

@@ -1,2 +0,0 @@
-image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_2
-port: 20100

setenv.sh

@@ -0,0 +1 @@
+kubectl config set current-context k3os-alpha.dnet-ducoterra-minecraft

testcraft/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

testcraft/Chart.yaml

@@ -1,23 +0,0 @@
-apiVersion: v2
-name: charts
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16.0

testcraft/templates/configmap.yaml

@@ -1,45 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}
-data:
-  eula.txt: |
-    eula=true
-  server.properties: |
-    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=amplified
-    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=512
-    level-seed=
-    prevent-proxy-connections=false
-    use-native-transport=true
-    motd=This is gonna be interesting
-    enable-rcon=false

testcraft/templates/pvc.yaml

@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Release.Name }}
-  annotations:
-    "helm.sh/resource-policy": keep
-spec:
-  storageClassName: nvme
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 32Gi

testcraft/templates/service.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}
-spec:
-  selector:
-    app: {{ .Release.Name }}
-  ports:
-  - port: {{ .Values.port }}
-    targetPort: 25565
-    name: {{ .Release.Name }}
-  type: LoadBalancer

testcraft/values.yaml

@@ -1,2 +0,0 @@
-image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_3
-port: 25566

values-camcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 20101
+max_cpu: 8
+max_ram: 8
+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

values-minecraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 25565
+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

values-pubcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 20100
+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

values-testcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 25566
+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=amplified
+  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=64
+  resource-pack=
+  spawn-animals=true
+  white-list=true
+  generate-structures=true
+  online-mode=true
+  max-build-height=512
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false