upgrade to 1.6.4

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 variables:
   CI_PROJECT_NAME: "minecraft"
   CI_PROJECT_DIR: "."
-  CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/homer
+  CI_REGISTRY_IMAGE: hub.ducoterra.net/ducoterra/minecraft
 
 stages:
   - build
@@ -18,21 +18,4 @@ build:
     entrypoint: [""]
   script:
     - echo $DEPLOY
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-
-deploy_to_prod:
-  variables:
-    DEPLOY: prod
-  stage: deploy
-  only:
-    variables:
-    - $CI_COMMIT_TAG
-  image:
-    name: debian:10
-    entrypoint: [""]
-  script:
-    - apt -qq update >> /dev/null && apt -qq install -y curl >> /dev/null
-    - curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
-    - chmod +x /usr/local/bin/kubectl
-    - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
-    - helm template $CI_PROJECT_NAME --set tag=1.1.1 ./helm | kubectl apply -f -
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG

Dockerfile

@@ -1,9 +1,6 @@
 FROM openjdk:8-slim
 
-RUN apt update && apt install -y rsync
-
-WORKDIR /mc_server
-COPY ./server .
+COPY server.jar /server.jar
 
 RUN groupadd -r minecraft && useradd --no-log-init -r -g minecraft minecraft
 WORKDIR /mc_data
@@ -11,5 +8,4 @@ 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 cp -r /mc_server/. . && \
-java -server -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSIncrementalPacing -XX:ParallelGCThreads="$THREADS" -XX:+AggressiveOpts -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

README.md

@@ -71,4 +71,10 @@ kubectl cp <backup> <pod_name>:/mc_data
 
 ## Cool seeds
 
-with an amplified world, -8018833100564192815
+### 7485786574821478084
+
+Spawns you next to a nether portal with golden axe and pickaxe. River and Village close by.
+
+### -8018833100564192815
+
+Use with an amplified world, massive island

build.sh

@@ -1,3 +0,0 @@
-docker-compose build mc
-docker-compose push mc
-kubectl apply -f k8s/

docker-compose.yaml

@@ -3,16 +3,4 @@ version: '3'
 services:
   minecraft:
     build: .
-    image: hub.ducoterra.net/ducoterra/minecraft:1.15.2_1
-    ports:
-      - 25565:25565
-    volumes:
-      - ./data:/mc_data
-    tty: true
-    stdin_open: true
-    restart: always
-    environment: 
-      - MAX_RAM=2
-      - MIN_RAM=1
-      - THREADS=2
-    user: minecraft
+    image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_3

helm/values.yaml

@@ -1 +0,0 @@
-image: hub.ducoterra.net/ducoterra/minecraft:1.15.2_1

minecraft/Chart.yaml

@@ -0,0 +1,23 @@
+apiVersion: v2
+name: minecraft
+description: Personal Minecraft Server
+
+# 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: 1.16
+
+# 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

minecraft/templates/configmap.yaml

@@ -0,0 +1,45 @@
+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

@@ -0,0 +1,50 @@
+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

@@ -2,10 +2,12 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ .Release.Name }}
+  annotations:
+    "helm.sh/resource-policy": keep
 spec:
-  storageClassName: nfs-encrypted
+  storageClassName: nvme
   accessModes:
-    - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 32Gi

minecraft/templates/service.yaml

@@ -6,7 +6,7 @@ spec:
   selector:
     app: {{ .Release.Name }}
   ports:
-  - port: 25565
+  - port: {{ .Values.port }}
     targetPort: 25565
     name: {{ .Release.Name }}
   type: LoadBalancer

minecraft/values.yaml

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

pubcraft/.helmignore

@@ -0,0 +1,23 @@
+# 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/templates/configmap.yaml

@@ -0,0 +1,45 @@
+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

@@ -19,6 +19,12 @@ spec:
         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:
@@ -33,9 +39,12 @@ spec:
             memory: "2Gi"
             cpu: 250m
           limits:
-            memory: "4Gi"
+            memory: "8Gi"
             cpu: "4"
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: {{ .Release.Name }}
+      - name: properties
+        configMap:
+          name: {{ .Release.Name }}

pubcraft/templates/pvc.yaml

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

pubcraft/templates/service.yaml

@@ -0,0 +1,12 @@
+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

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

server/eula.txt

@@ -1 +0,0 @@
-eula=true

server/server.properties

@@ -1,39 +0,0 @@
-#Minecraft server properties
-#Thu Jan 02 01:15:23 UTC 2020
-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=20
-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

servers.md

@@ -0,0 +1,19 @@
+# Servers
+
+## Minecraft
+
+```bash
+helm upgrade --install minecraft ./helm --set tag=1.15.2_7 --set port=25565
+```
+
+## Pubcraft
+
+```bash
+helm upgrade --install pubcraft ./helm --set tag=1.15.2_7 --set port=20100
+```
+
+## TestCraft
+
+```bash
+helm upgrade --install testcraft ./helm --set tag=1.16.1_2 --set port=25566
+```

testcraft/.helmignore

@@ -0,0 +1,23 @@
+# 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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,45 @@
+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/deploy.yaml

@@ -0,0 +1,48 @@
+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"
+        resources:
+          requests:
+            memory: "2Gi"
+            cpu: 250m
+          limits:
+            memory: "8Gi"
+            cpu: "4"
+      volumes:
+      - name: data
+        persistentVolumeClaim:
+          claimName: {{ .Release.Name }}
+      - name: properties
+        configMap:
+          name: {{ .Release.Name }}

testcraft/templates/pvc.yaml

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,12 @@
+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

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