[FEATURE] Migrated to new loading sequence (#6)

Co-authored-by: Dunemask <dunemask@gmail.com>
Reviewed-on: https://gitea.dunemask.dev/elysium/minecluster/pulls/6

lib/k8s/configs/backup-secret.yml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  annotations:
+    minecluster.dunemask.net/id: changeme-server-id
+  labels:
+    app: changeme-app-label
+  name: changeme-backup-secret
+type: Opaque
+data:
+  rclone.conf: ""

lib/k8s/configs/containers/ftp-server.yml

@@ -6,23 +6,21 @@ env:
 image: garethflowers/ftp-server
 imagePullPolicy: IfNotPresent
 livenessProbe:
-exec:
-  command: ["echo"]
-failureThreshold: 20
-initialDelaySeconds: 30
-periodSeconds: 5
-successThreshold: 1
-timeoutSeconds: 1
+  exec: { command: ["echo"] }
+  failureThreshold: 20
+  initialDelaySeconds: 0
+  periodSeconds: 5
+  successThreshold: 1
+  timeoutSeconds: 1
 name: changeme-name-ftp
 ports: [] # Programatically add all the ports for easier readability, Ports include: 20,21,40000-400009
 readinessProbe:
-  exec:
-    command: ["echo"]
-    failureThreshold: 20
-    initialDelaySeconds: 30
-    periodSeconds: 5
-    successThreshold: 1
-    timeoutSeconds: 1
+  exec: { command: ["echo"] }
+  failureThreshold: 20
+  initialDelaySeconds: 0
+  periodSeconds: 5
+  successThreshold: 1
+  timeoutSeconds: 1
 resources:
   requests:
     cpu: 50m

lib/k8s/configs/containers/minecraft-backup.yml

@@ -33,20 +33,20 @@ env:
   - name: DEST_DIR
     value: /backups
   - name: LINK_LATEST
-    value: "false"
+    value: "true"
   - name: TAR_COMPRESS_METHOD
     value: gzip
   - name: ZSTD_PARAMETERS
     value: -3 --long=25 --single-thread
   - name: RCLONE_REMOTE
-    value: mc-dunemask-net
+    value: mcl-backup-changeme
   - name: RCLONE_DEST_DIR
-    value: /minecraft-backups/deltasmp-backups
+    value: /mcl/backups/changeme
   - name: RCLONE_COMPRESS_METHOD
     value: gzip
 image: itzg/mc-backup:latest
 imagePullPolicy: IfNotPresent
-name: mcs-deltasmp-minecraft-mc-backup
+name: mcl-backup-changeme
 resources:
   requests:
     cpu: 500m

lib/k8s/configs/containers/minecraft-server.yml

@@ -72,12 +72,10 @@ env:
 image: itzg/minecraft-server:latest
 imagePullPolicy: IfNotPresent
 livenessProbe:
-  exec:
-    command:
-      - mc-health
-  failureThreshold: 20
+  exec: { command: [mc-health] }
+  failureThreshold: 200
   initialDelaySeconds: 30
-  periodSeconds: 5
+  periodSeconds: 3
   successThreshold: 1
   timeoutSeconds: 1
 name: changeme-name-server
@@ -88,15 +86,13 @@ ports:
   - containerPort: 25575
     name: rcon
     protocol: TCP
-readinessProbe:
-  exec:
-    command:
-      - mc-health
-  failureThreshold: 20
-  initialDelaySeconds: 30
-  periodSeconds: 5
-  successThreshold: 1
-  timeoutSeconds: 1
+# readinessProbe: # Disabling this allows for users to manipulate files even if the container is starting
+#   exec: {command: [mc-health]}
+#   failureThreshold: 200
+#   initialDelaySeconds: 30
+#   periodSeconds: 3
+#   successThreshold: 1
+#   timeoutSeconds: 1
 resources:
   requests:
     cpu: 500m

lib/k8s/configs/rcon-secret.yml

@@ -4,7 +4,7 @@ data:
 kind: Secret
 metadata:
   annotations:
-    minecluster.dunemask.net/server-name: changeme-server-name
+    minecluster.dunemask.net/id: changeme-server-id
   labels:
     app: changeme-app-label
   name: changeme-rcon-secret

lib/k8s/configs/rcon-svc.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    minecluster.dunemask.net/server-name: changeme-server-name
+    minecluster.dunemask.net/id: changeme-server-id
   labels:
     app: changeme-app
   name: changeme-rcon

lib/k8s/configs/server-deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    minecluster.dunemask.net/server-name: changeme-server-name
+    minecluster.dunemask.net/id: changeme-server-id
   name: changeme-name
   namespace: changeme-namespace
 spec:
@@ -17,7 +17,7 @@ spec:
   template:
     metadata:
       annotations:
-        minecluster.dunemask.net/server-name: changeme-server-name
+        minecluster.dunemask.net/id: changeme-server-id
       labels:
         app: changeme-app
     spec:
@@ -35,10 +35,10 @@ spec:
             claimName: changeme-pvc-name
         - emptyDir: {}
           name: backupdir
-        - name: rclone-config
-          secret:
-            defaultMode: 420
-            items:
-              - key: rclone.conf
-                path: rclone.conf
-            secretName: rclone-config
+        # - name: rclone-config
+        #   secret:
+        #     defaultMode: 420
+        #     items:
+        #       - key: rclone.conf
+        #         path: rclone.conf
+        #     secretName: rclone-config

lib/k8s/configs/server-pvc.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
-    minecluster.dunemask.net/server-name: changeme-server-name
+    minecluster.dunemask.net/id: changeme-server-id
   labels:
     service: changeme-service-name
   name: changeme-pvc-name

lib/k8s/configs/server-svc.yml

@@ -4,7 +4,7 @@ metadata:
   annotations:
     ingress.qumine.io/hostname: changeme-url
     ingress.qumine.io/portname: minecraft
-    minecluster.dunemask.net/server-name: changeme-server-name
+    minecluster.dunemask.net/id: changeme-server-id
   labels:
     app: changeme-app
   name: changeme-name