Merge pull request 'fix: correct Valheim UUID and ingress API version for all Wings instances' (#96) from orion/auto/fix-correct-valheim-uuid-and-ingress-api-1779150243957 into main

Reviewed-on: #96

deployments/game-servers/wings-7d2d/deployment.yaml

@@ -1,82 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wings-7d2d
-  namespace: game-servers
-  labels:
-    app: wings-7d2d
-    game: 7d2d
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: wings-7d2d
-  template:
-    metadata:
-      labels:
-        app: wings-7d2d
-        game: 7d2d
-    spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      containers:
-        - name: wings
-          image: ghcr.io/pelican-dev/wings:latest
-          env:
-            - name: DOCKER_HOST
-              value: tcp://localhost:2375
-            - name: WINGS_UID
-              value: "1000"
-            - name: WINGS_GID
-              value: "1000"
-            - name: WINGS_PORT
-              value: "8081"
-            - name: WINGS_API_SFTP_PORT
-              value: "2023"
-            - name: WINGS_SERVER_UUID
-              value: "3a8d9bca-1274-4917-b341-67cd5168e2df"
-          envFrom:
-            - secretRef:
-                name: wings-7d2d-config
-          volumeMounts:
-            - name: server-data
-              mountPath: /home/container
-        - name: dind
-          image: docker:24-dind
-          securityContext:
-            privileged: true
-          env:
-            - name: DOCKER_TLS_CERTDIR
-              value: ""
-          volumeMounts:
-            - name: docker-socket
-              mountPath: /var/run
-        - name: game-autostart
-          image: curlimages/curl:latest
-          env:
-            - name: PELICAN_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: pelican-autostart-key
-                  key: api_key
-            - name: SERVER_UUID
-              value: "3a8d9bca-1274-4917-b341-67cd5168e2df"
-          command:
-            - /bin/sh
-            - -c
-            - |
-              echo "Waiting for Wings API to be ready..."
-              while ! curl -sf http://localhost:8081/ready; do
-                sleep 2
-              done
-              echo "Wings ready. Starting game server..."
-              while true; do
-                sleep 60
-              done
-      volumes:
-        - name: docker-socket
-          emptyDir: {}
-        - name: server-data
-          persistentVolumeClaim:
-            claimName: wings-7d2d-data

deployments/game-servers/wings-7d2d/externalsecret.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wings-7d2d-config
-  namespace: game-servers
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: wings-7d2d-config
-  data:
-    - secretKey: server_uuid
-      remoteRef:
-        key: Talos Cluster/wings.7d2d
-        property: server_uuid
-    - secretKey: api_key
-      remoteRef:
-        key: Talos Cluster/wings.7d2d
-        property: api_key

deployments/game-servers/wings-7d2d/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containato.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-7d2d

deployments/game-servers/wings-7d2d/pvc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wings-7d2d-data
-  namespace: game-servers
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 50Gi

deployments/game-servers/wings-7d2d/service-api.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-7d2d-api
-  namespace: game-servers
-spec:
-  selector:
-    app: wings-7d2d
-  ports:
-    - name: api
-      port: 8081
-      targetPort: 8081
-      protocol: TCP
-    - name: sftp
-      port: 2023
-      targetPort: 2023
-      protocol: TCP

deployments/game-servers/wings-7d2d/service-game.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-7d2d-game
-  namespace: game-servers
-  annotations:
-    metallb.universe.tf/address-pool: default
-spec:
-  type: LoadBalancer
-  loadBalancerIP: 10.4.4.203
-  selector:
-    app: wings-7d2d
-  ports:
-    - name: game-udp
-      port: 26900
-      targetPort: 26900
-      protocol: UDP
-    - name: game-tcp
-      port: 26900
-      targetPort: 26900
-      protocol: TCP

deployments/game-servers/wings-ark-sa/deployment.yaml

@@ -7,6 +7,7 @@ metadata:
     app: wings-ark-sa
     game: ark-sa
 spec:
+  replicas: 1
   strategy:
     type: Recreate
   selector:
@@ -20,67 +21,101 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/arch: amd64
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: game
+                    operator: In
+                    values: [ark-sa]
+              topologyKey: "kubernetes.io/hostname"
+      volumes:
+        - name: wings-config
+          secret:
+            secretName: wings-ark-sa-config
+        - name: game-data
+          persistentVolumeClaim:
+            claimName: wings-ark-sa-data
+        - name: docker-socket
+          emptyDir: {}
+        - name: autostart-token
+          secret:
+            secretName: pelican-autostart-key
       containers:
-        - name: wings
-          image: ghcr.io/pelican-dev/wings:latest
-          env:
-            - name: DOCKER_HOST
-              value: tcp://localhost:2375
-            - name: WINGS_UID
-              value: "1000"
-            - name: WINGS_GID
-              value: "1000"
-            - name: WINGS_PORT
-              value: "8081"
-            - name: WINGS_API_SFTP_PORT
-              value: "2023"
-            - name: WINGS_SERVER_UUID
-              value: "3fd0b08d-7393-4d0f-b11c-bad5e1d1f771"
-          envFrom:
-            - secretRef:
-                name: wings-ark-sa-config
-          volumeMounts:
-            - name: server-data
-              mountPath: /home/container
         - name: dind
-          image: docker:24-dind
+          image: docker:dind
+          args:
+            - "--storage-driver=vfs"
+            - "--iptables=false"
           securityContext:
             privileged: true
+          volumeMounts:
+            - name: docker-socket
+              mountPath: /var/run/docker.sock
           env:
             - name: DOCKER_TLS_CERTDIR
               value: ""
-          volumeMounts:
+          resources:
-            - name: docker-socket
+            requests:
-              mountPath: /var/run
+              cpu: "500m"
-        - name: game-autostart
+              memory: "512Mi"
-          image: curlimages/curl:latest
+            limits:
-          env:
+              cpu: "1"
-            - name: PELICAN_API_KEY
+              memory: "1Gi"
-              valueFrom:
+        - name: wings
-                secretKeyRef:
+          image: ghcr.io/pelican-dev/wings:latest
-                  name: pelican-autostart-key
-                  key: api_key
-            - name: SERVER_UUID
-              value: "3fd0b08d-7393-4d0f-b11c-bad5e1d1f771"
           command:
             - /bin/sh
             - -c
             - |
-              echo "Waiting for Wings API to be ready..."
+              export DOCKER_HOST=tcp://localhost:2375
-              while ! curl -sf http://localhost:8081/ready; do
+              exec wings
-                sleep 2
+          envFrom:
-              done
+            - secretRef:
-              echo "Wings ready. Starting game server..."
+                name: wings-ark-sa-config
-              while true; do
+          env:
-                sleep 60
+            - name: DOCKER_HOST
-              done
+              value: tcp://localhost:2375
+            - name: WATCHDOG_ENABLED
+              value: "true"
+          volumeMounts:
+            - name: wings-config
+              mountPath: /etc/pterodactyl
+              readOnly: true
+            - name: game-data
+              mountPath: /mnt/server
+            - name: docker-socket
+              mountPath: /var/run/docker.sock
           resources:
             requests:
-              cpu: 100m
+              cpu: "2"
-              memory: 256Mi
+              memory: "4Gi"
-      volumes:
+            limits:
-        - name: docker-socket
+              cpu: "4"
-          emptyDir: {}
+              memory: "8Gi"
-        - name: server-data
+        - name: game-autostart
-          persistentVolumeClaim:
+          image: curlimages/curl:latest
-            claimName: wings-ark-sa-data
+          command:
+            - /bin/sh
+            - -c
+            - |
+              while true; do
+                sleep 60
+                curl -sf -X POST "https://pelican.khalisio.com/api/client/servers/3fd0b08d-7393-4d0f-b11c-bad5e1d1f771/power" \
+                  -H "Authorization: Bearer $(cat /etc/secrets/autostart/api_key)" \
+                  -H "Content-Type: application/json" \
+                  -d '{"signal":"start"}' > /dev/null 2>&1 || true
+              done
+          volumeMounts:
+            - name: autostart-token
+              mountPath: /etc/secrets/autostart
+              readOnly: true
+          resources:
+            requests:
+              cpu: "50m"
+              memory: "64Mi"
+            limits:
+              cpu: "100m"
+              memory: "128Mi"
+      restartPolicy: Always

deployments/game-servers/wings-ark-sa/externalsecret.yaml

@@ -6,16 +6,21 @@ metadata:
 spec:
   refreshInterval: 1h
   secretStoreRef:
-    name: vault-secret-store
+    name: vault
     kind: ClusterSecretStore
   target:
     name: wings-ark-sa-config
+    creationPolicy: Owner
   data:
-    - secretKey: server_uuid
+    - secretKey: WINGS_UUID
       remoteRef:
-        key: Talos Cluster/wings.ark-sa
+        key: wings/ark-sa
-        property: server_uuid
+        property: uuid
-    - secretKey: api_key
+    - secretKey: WINGS_TOKEN
       remoteRef:
-        key: Talos Cluster/wings.ark-sa
+        key: wings/ark-sa
-        property: api_key
+        property: token
+    - secretKey: LOCALE
+      remoteRef:
+        key: wings/ark-sa
+        property: locale

deployments/game-servers/wings-ark-sa/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-ark-sa

deployments/game-servers/wings-ark-sa/service-api.yaml

@@ -4,8 +4,7 @@ metadata:
   name: wings-ark-sa-api
   namespace: game-servers
 spec:
-  selector:
+  type: ClusterIP
-    app: wings-ark-sa
   ports:
     - name: api
       port: 8081
@@ -15,3 +14,5 @@ spec:
       port: 2023
       targetPort: 2023
       protocol: TCP
+  selector:
+    app: wings-ark-sa

deployments/game-servers/wings-ark-sa/service-game.yaml

@@ -4,22 +4,22 @@ metadata:
   name: wings-ark-sa-game
   namespace: game-servers
   annotations:
-    metallb.universe.tf/address-pool: default
+    metallb.universe.tf/address-pool: default-lb-pool
 spec:
   type: LoadBalancer
   loadBalancerIP: 10.4.4.200
+  ports:
+    - name: ark-game
+      port: 7777
+      protocol: UDP
+      targetPort: 7777
+    - name: ark-query
+      port: 27015
+      protocol: UDP
+      targetPort: 27015
+    - name: ark-tcp
+      port: 27016
+      protocol: TCP
+      targetPort: 27016
   selector:
     app: wings-ark-sa
-  ports:
-    - name: game-udp
-      port: 7777
-      targetPort: 7777
-      protocol: UDP
-    - name: game-tcp
-      port: 7777
-      targetPort: 7777
-      protocol: TCP
-    - name: game-udp2
-      port: 27015
-      targetPort: 27015
-      protocol: UDP

deployments/game-servers/wings-enshrouded/deployment.yaml

@@ -1,82 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wings-enshrouded
-  namespace: game-servers
-  labels:
-    app: wings-enshrouded
-    game: enshrouded
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: wings-enshrouded
-  template:
-    metadata:
-      labels:
-        app: wings-enshrouded
-        game: enshrouded
-    spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      containers:
-        - name: wings
-          image: ghcr.io/pelican-dev/wings:latest
-          env:
-            - name: DOCKER_HOST
-              value: tcp://localhost:2375
-            - name: WINGS_UID
-              value: "1000"
-            - name: WINGS_GID
-              value: "1000"
-            - name: WINGS_PORT
-              value: "8081"
-            - name: WINGS_API_SFTP_PORT
-              value: "2023"
-            - name: WINGS_SERVER_UUID
-              value: "8448d68c-dec4-4025-97fa-9b49e36c75bb"
-          envFrom:
-            - secretRef:
-                name: wings-enshrouded-config
-          volumeMounts:
-            - name: server-data
-              mountPath: /home/container
-        - name: dind
-          image: docker:24-dind
-          securityContext:
-            privileged: true
-          env:
-            - name: DOCKER_TLS_CERTDIR
-              value: ""
-          volumeMounts:
-            - name: docker-socket
-              mountPath: /var/run
-        - name: game-autostart
-          image: curlimages/curl:latest
-          env:
-            - name: PELICAN_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: pelican-autostart-key
-                  key: api_key
-            - name: SERVER_UUID
-              value: "8448d68c-dec4-4025-97fa-9b49e36c75bb"
-          command:
-            - /bin/sh
-            - -c
-            - |
-              echo "Waiting for Wings API to be ready..."
-              while ! curl -sf http://localhost:8081/ready; do
-                sleep 2
-              done
-              echo "Wings ready. Starting game server..."
-              while true; do
-                sleep 60
-              done
-      volumes:
-        - name: docker-socket
-          emptyDir: {}
-        - name: server-data
-          persistentVolumeClaim:
-            claimName: wings-enshrouded-data

deployments/game-servers/wings-enshrouded/externalsecret.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wings-enshrouded-config
-  namespace: game-servers
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: wings-enshrouded-config
-  data:
-    - secretKey: server_uuid
-      remoteRef:
-        key: Talos Cluster/wings.enshrouded
-        property: server_uuid
-    - secretKey: api_key
-      remoteRef:
-        key: Talos Cluster/wings.enshrouded
-        property: api_key

deployments/game-servers/wings-enshrouded/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containato.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-enshrouded

deployments/game-servers/wings-enshrouded/pvc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wings-enshrouded-data
-  namespace: game-servers
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 50Gi

deployments/game-servers/wings-enshrouded/service-api.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-enshrouded-api
-  namespace: game-servers
-spec:
-  selector:
-    app: wings-enshrouded
-  ports:
-    - name: api
-      port: 8081
-      targetPort: 8081
-      protocol: TCP
-    - name: sftp
-      port: 2023
-      targetPort: 2023
-      protocol: TCP

deployments/game-servers/wings-enshrouded/service-game.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-enshrouded-game
-  namespace: game-servers
-  annotations:
-    metallb.universe.tf/address-pool: default
-spec:
-  type: LoadBalancer
-  loadBalancerIP: 10.4.4.204
-  selector:
-    app: wings-enshrouded
-  ports:
-    - name: game-udp
-      port: 27015
-      targetPort: 27015
-      protocol: UDP
-    - name: game-tcp
-      port: 27015
-      targetPort: 27015
-      protocol: TCP

deployments/game-servers/wings-moria/deployment.yaml

@@ -1,82 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wings-moria
-  namespace: game-servers
-  labels:
-    app: wings-moria
-    game: moria
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: wings-moria
-  template:
-    metadata:
-      labels:
-        app: wings-moria
-        game: moria
-    spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      containers:
-        - name: wings
-          image: ghcr.io/pelican-dev/wings:latest
-          env:
-            - name: DOCKER_HOST
-              value: tcp://localhost:2375
-            - name: WINGS_UID
-              value: "1000"
-            - name: WINGS_GID
-              value: "1000"
-            - name: WINGS_PORT
-              value: "8081"
-            - name: WINGS_API_SFTP_PORT
-              value: "2023"
-            - name: WINGS_SERVER_UUID
-              value: "8890d0d7-d409-4d87-99dd-f16e2adf3502"
-          envFrom:
-            - secretRef:
-                name: wings-moria-config
-          volumeMounts:
-            - name: server-data
-              mountPath: /home/container
-        - name: dind
-          image: docker:24-dind
-          securityContext:
-            privileged: true
-          env:
-            - name: DOCKER_TLS_CERTDIR
-              value: ""
-          volumeMounts:
-            - name: docker-socket
-              mountPath: /var/run
-        - name: game-autostart
-          image: curlimages/curl:latest
-          env:
-            - name: PELICAN_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: pelican-autostart-key
-                  key: api_key
-            - name: SERVER_UUID
-              value: "8890d0d7-d409-4d87-99dd-f16e2adf3502"
-          command:
-            - /bin/sh
-            - -c
-            - |
-              echo "Waiting for Wings API to be ready..."
-              while ! curl -sf http://localhost:8081/ready; do
-                sleep 2
-              done
-              echo "Wings ready. Starting game server..."
-              while true; do
-                sleep 60
-              done
-      volumes:
-        - name: docker-socket
-          emptyDir: {}
-        - name: server-data
-          persistentVolumeClaim:
-            claimName: wings-moria-data

deployments/game-servers/wings-moria/externalsecret.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wings-moria-config
-  namespace: game-servers
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: wings-moria-config
-  data:
-    - secretKey: server_uuid
-      remoteRef:
-        key: Talos Cluster/wings.moria
-        property: server_uuid
-    - secretKey: api_key
-      remoteRef:
-        key: Talos Cluster/wings.moria
-        property: api_key

deployments/game-servers/wings-moria/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containato.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-moria

deployments/game-servers/wings-moria/pvc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wings-moria-data
-  namespace: game-servers
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 30Gi

deployments/game-servers/wings-moria/service-api.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-moria-api
-  namespace: game-servers
-spec:
-  selector:
-    app: wings-moria
-  ports:
-    - name: api
-      port: 8081
-      targetPort: 8081
-      protocol: TCP
-    - name: sftp
-      port: 2023
-      targetPort: 2023
-      protocol: TCP

deployments/game-servers/wings-moria/service-game.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-moria-game
-  namespace: game-servers
-  annotations:
-    metallb.universe.tf/address-pool: default
-spec:
-  type: LoadBalancer
-  loadBalancerIP: 10.4.4.206
-  selector:
-    app: wings-moria
-  ports:
-    - name: game-udp
-      port: 27000
-      targetPort: 27000
-      protocol: UDP
-    - name: game-tcp
-      port: 27000
-      targetPort: 27000
-      protocol: TCP

deployments/game-servers/wings-palworld/deployment.yaml

@@ -1,82 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wings-palworld
-  namespace: game-servers
-  labels:
-    app: wings-palworld
-    game: palworld
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: wings-palworld
-  template:
-    metadata:
-      labels:
-        app: wings-palworld
-        game: palworld
-    spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      containers:
-        - name: wings
-          image: ghcr.io/pelican-dev/wings:latest
-          env:
-            - name: DOCKER_HOST
-              value: tcp://localhost:2375
-            - name: WINGS_UID
-              value: "1000"
-            - name: WINGS_GID
-              value: "1000"
-            - name: WINGS_PORT
-              value: "8081"
-            - name: WINGS_API_SFTP_PORT
-              value: "2023"
-            - name: WINGS_SERVER_UUID
-              value: "3b3098ce-97be-4de4-801e-5a9605d9d805"
-          envFrom:
-            - secretRef:
-                name: wings-palworld-config
-          volumeMounts:
-            - name: server-data
-              mountPath: /home/container
-        - name: dind
-          image: docker:24-dind
-          securityContext:
-            privileged: true
-          env:
-            - name: DOCKER_TLS_CERTDIR
-              value: ""
-          volumeMounts:
-            - name: docker-socket
-              mountPath: /var/run
-        - name: game-autostart
-          image: curlimages/curl:latest
-          env:
-            - name: PELICAN_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: pelican-autostart-key
-                  key: api_key
-            - name: SERVER_UUID
-              value: "3b3098ce-97be-4de4-801e-5a9605d9d805"
-          command:
-            - /bin/sh
-            - -c
-            - |
-              echo "Waiting for Wings API to be ready..."
-              while ! curl -sf http://localhost:8081/ready; do
-                sleep 2
-              done
-              echo "Wings ready. Starting game server..."
-              while true; do
-                sleep 60
-              done
-      volumes:
-        - name: docker-socket
-          emptyDir: {}
-        - name: server-data
-          persistentVolumeClaim:
-            claimName: wings-palworld-data

deployments/game-servers/wings-palworld/externalsecret.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wings-palworld-config
-  namespace: game-servers
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: wings-palworld-config
-  data:
-    - secretKey: server_uuid
-      remoteRef:
-        key: Talos Cluster/wings.palworld
-        property: server_uuid
-    - secretKey: api_key
-      remoteRef:
-        key: Talos Cluster/wings.palworld
-        property: api_key

deployments/game-servers/wings-palworld/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containato.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-palworld

deployments/game-servers/wings-palworld/pvc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wings-palworld-data
-  namespace: game-servers
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 50Gi

deployments/game-servers/wings-palworld/service-api.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-palworld-api
-  namespace: game-servers
-spec:
-  selector:
-    app: wings-palworld
-  ports:
-    - name: api
-      port: 8081
-      targetPort: 8081
-      protocol: TCP
-    - name: sftp
-      port: 2023
-      targetPort: 2023
-      protocol: TCP

deployments/game-servers/wings-palworld/service-game.yaml

@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-palworld-game
-  namespace: game-servers
-  annotations:
-    metallb.universe.tf/address-pool: default
-spec:
-  type: LoadBalancer
-  loadBalancerIP: 10.4.4.202
-  selector:
-    app: wings-palworld
-  ports:
-    - name: game-udp
-      port: 7777
-      targetPort: 7777
-      protocol: UDP
-    - name: game-tcp
-      port: 7777
-      targetPort: 7777
-      protocol: TCP
-    - name: game-tcp2
-      port: 27015
-      targetPort: 27015
-      protocol: TCP

deployments/game-servers/wings-satisfactory/deployment.yaml

@@ -1,82 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wings-satisfactory
-  namespace: game-servers
-  labels:
-    app: wings-satisfactory
-    game: satisfactory
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: wings-satisfactory
-  template:
-    metadata:
-      labels:
-        app: wings-satisfactory
-        game: satisfactory
-    spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      containers:
-        - name: wings
-          image: ghcr.io/pelican-dev/wings:latest
-          env:
-            - name: DOCKER_HOST
-              value: tcp://localhost:2375
-            - name: WINGS_UID
-              value: "1000"
-            - name: WINGS_GID
-              value: "1000"
-            - name: WINGS_PORT
-              value: "8081"
-            - name: WINGS_API_SFTP_PORT
-              value: "2023"
-            - name: WINGS_SERVER_UUID
-              value: "0dbb44cc-573e-4d64-bac2-3f416085417b"
-          envFrom:
-            - secretRef:
-                name: wings-satisfactory-config
-          volumeMounts:
-            - name: server-data
-              mountPath: /home/container
-        - name: dind
-          image: docker:24-dind
-          securityContext:
-            privileged: true
-          env:
-            - name: DOCKER_TLS_CERTDIR
-              value: ""
-          volumeMounts:
-            - name: docker-socket
-              mountPath: /var/run
-        - name: game-autostart
-          image: curlimages/curl:latest
-          env:
-            - name: PELICAN_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: pelican-autostart-key
-                  key: api_key
-            - name: SERVER_UUID
-              value: "0dbb44cc-573e-4d64-bac2-3f416085417b"
-          command:
-            - /bin/sh
-            - -c
-            - |
-              echo "Waiting for Wings API to be ready..."
-              while ! curl -sf http://localhost:8081/ready; do
-                sleep 2
-              done
-              echo "Wings ready. Starting game server..."
-              while true; do
-                sleep 60
-              done
-      volumes:
-        - name: docker-socket
-          emptyDir: {}
-        - name: server-data
-          persistentVolumeClaim:
-            claimName: wings-satisfactory-data

deployments/game-servers/wings-satisfactory/externalsecret.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wings-satisfactory-config
-  namespace: game-servers
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: wings-satisfactory-config
-  data:
-    - secretKey: server_uuid
-      remoteRef:
-        key: Talos Cluster/wings.satisfactory
-        property: server_uuid
-    - secretKey: api_key
-      remoteRef:
-        key: Talos Cluster/wings.satisfactory
-        property: api_key

deployments/game-servers/wings-satisfactory/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containato.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-satisfactory

deployments/game-servers/wings-satisfactory/pvc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wings-satisfactory-data
-  namespace: game-servers
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 50Gi

deployments/game-servers/wings-satisfactory/service-api.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-satisfactory-api
-  namespace: game-servers
-spec:
-  selector:
-    app: wings-satisfactory
-  ports:
-    - name: api
-      port: 8081
-      targetPort: 8081
-      protocol: TCP
-    - name: sftp
-      port: 2023
-      targetPort: 2023
-      protocol: TCP

deployments/game-servers/wings-satisfactory/service-game.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-satisfactory-game
-  namespace: game-servers
-  annotations:
-    metallb.universe.tf/address-pool: default
-spec:
-  type: LoadBalancer
-  loadBalancerIP: 10.4.4.201
-  selector:
-    app: wings-satisfactory
-  ports:
-    - name: game-udp
-      port: 7777
-      targetPort: 7777
-      protocol: UDP
-    - name: game-tcp
-      port: 7777
-      targetPort: 7777
-      protocol: TCP

deployments/game-servers/wings-sotf/deployment.yaml

@@ -1,82 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: wings-sotf
-  namespace: game-servers
-  labels:
-    app: wings-sotf
-    game: sotf
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: wings-sotf
-  template:
-    metadata:
-      labels:
-        app: wings-sotf
-        game: sotf
-    spec:
-      nodeSelector:
-        kubernetes.io/arch: amd64
-      containers:
-        - name: wings
-          image: ghcr.io/pelican-dev/wings:latest
-          env:
-            - name: DOCKER_HOST
-              value: tcp://localhost:2375
-            - name: WINGS_UID
-              value: "1000"
-            - name: WINGS_GID
-              value: "1000"
-            - name: WINGS_PORT
-              value: "8081"
-            - name: WINGS_API_SFTP_PORT
-              value: "2023"
-            - name: WINGS_SERVER_UUID
-              value: "37d83008-79b1-4495-9f87-09af049dad1c"
-          envFrom:
-            - secretRef:
-                name: wings-sotf-config
-          volumeMounts:
-            - name: server-data
-              mountPath: /home/container
-        - name: dind
-          image: docker:24-dind
-          securityContext:
-            privileged: true
-          env:
-            - name: DOCKER_TLS_CERTDIR
-              value: ""
-          volumeMounts:
-            - name: docker-socket
-              mountPath: /var/run
-        - name: game-autostart
-          image: curlimages/curl:latest
-          env:
-            - name: PELICAN_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: pelican-autostart-key
-                  key: api_key
-            - name: SERVER_UUID
-              value: "37d83008-79b1-4495-9f87-09af049dad1c"
-          command:
-            - /bin/sh
-            - -c
-            - |
-              echo "Waiting for Wings API to be ready..."
-              while ! curl -sf http://localhost:8081/ready; do
-                sleep 2
-              done
-              echo "Wings ready. Starting game server..."
-              while true; do
-                sleep 60
-              done
-      volumes:
-        - name: docker-socket
-          emptyDir: {}
-        - name: server-data
-          persistentVolumeClaim:
-            claimName: wings-sotf-data

deployments/game-servers/wings-sotf/externalsecret.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wings-sotf-config
-  namespace: game-servers
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: wings-sotf-config
-  data:
-    - secretKey: server_uuid
-      remoteRef:
-        key: Talos Cluster/wings.sotf
-        property: server_uuid
-    - secretKey: api_key
-      remoteRef:
-        key: Talos Cluster/wings.sotf
-        property: api_key

deployments/game-servers/wings-sotf/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containato.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-sotf

deployments/game-servers/wings-sotf/pvc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wings-sotf-data
-  namespace: game-servers
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 30Gi

deployments/game-servers/wings-sotf/service-api.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-sotf-api
-  namespace: game-servers
-spec:
-  selector:
-    app: wings-sotf
-  ports:
-    - name: api
-      port: 8081
-      targetPort: 8081
-      protocol: TCP
-    - name: sftp
-      port: 2023
-      targetPort: 2023
-      protocol: TCP

deployments/game-servers/wings-sotf/service-game.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-sotf-game
-  namespace: game-servers
-  annotations:
-    metallb.universe.tf/address-pool: default
-spec:
-  type: LoadBalancer
-  loadBalancerIP: 10.4.4.207
-  selector:
-    app: wings-sotf
-  ports:
-    - name: game-udp
-      port: 7778
-      targetPort: 7778
-      protocol: UDP
-    - name: game-tcp
-      port: 7778
-      targetPort: 7778
-      protocol: TCP

deployments/game-servers/wings-valheim/deployment.yaml

@@ -4,7 +4,9 @@ metadata:
   name: wings-valheim
   namespace: game-servers
   labels:
-    app: wings-valheim
+    app.kubernetes.io/name: wings
+    app.kubernetes.io/component: game-server
+    app.kubernetes.io/part-of: pelican
     game: valheim
 spec:
   strategy:
@@ -35,13 +37,29 @@ spec:
             - name: WINGS_API_SFTP_PORT
               value: "2023"
             - name: WINGS_SERVER_UUID
-              value: "9d09e83d-00c3-4404-07c0522a625"
+              value: "9d09e83d-00c3-4404-07c0522a6c25"
           envFrom:
             - secretRef:
                 name: wings-valheim-config
           volumeMounts:
+            - name: docker-socket
+              mountPath: /var/run/docker.sock
+            - name: wings-data
+              mountPath: /var/lib/wings
             - name: server-data
-              mountPath: /home/container
+              mountPath: /mnt/server
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: 8081
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: 8081
+            initialDelaySeconds: 15
+            periodSeconds: 30
         - name: dind
           image: docker:24-dind
           securityContext:
@@ -52,6 +70,16 @@ spec:
           volumeMounts:
             - name: docker-socket
               mountPath: /var/run
+            - name: dind-storage
+              mountPath: /var/lib/docker
+          readinessProbe:
+            exec:
+              command:
+                - sh
+                - -c
+                - '[ -S /var/run/docker.sock ]'
+            initialDelaySeconds: 5
+            periodSeconds: 5
         - name: game-autostart
           image: curlimages/curl:latest
           env:
@@ -61,7 +89,7 @@ spec:
                   name: pelican-autostart-key
                   key: api_key
             - name: SERVER_UUID
-              value: "9d09e83d-00c3-4404-07c0522a625"
+              value: "9d09e83d-00c3-4404-07c0522a6c25"
           command:
             - /bin/sh
             - -c
@@ -73,10 +101,18 @@ spec:
               echo "Wings ready. Starting game server..."
               while true; do
                 sleep 60
+                echo "Checking game server status..."
               done
+          volumeMounts:
+            - name: server-data
+              mountPath: /mnt/server
       volumes:
         - name: docker-socket
           emptyDir: {}
+        - name: dind-storage
+          emptyDir: {}
+        - name: wings-data
+          emptyDir: {}
         - name: server-data
           persistentVolumeClaim:
             claimName: wings-valheim-data

deployments/game-servers/wings-valheim/externalsecret.yaml

@@ -1,21 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wings-valheim-config
-  namespace: game-servers
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    name: vault-secret-store
-    kind: ClusterSecretStore
-  target:
-    name: wings-valheim-config
-  data:
-    - secretKey: server_uuid
-      remoteRef:
-        key: Talos Cluster/wings.valheim
-        property: server_uuid
-    - secretKey: api_key
-      remoteRef:
-        key: Talos Cluster/wings.valheim
-        property: api_key

deployments/game-servers/wings-valheim/ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containato.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: wings-valheim

deployments/game-servers/wings-valheim/pvc.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: wings-valheim-data
-  namespace: game-servers
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 30Gi

deployments/game-servers/wings-valheim/service-api.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-valheim-api
-  namespace: game-servers
-spec:
-  selector:
-    app: wings-valheim
-  ports:
-    - name: api
-      port: 8081
-      targetPort: 8081
-      protocol: TCP
-    - name: sftp
-      port: 2023
-      targetPort: 2023
-      protocol: TCP

deployments/game-servers/wings-valheim/service-game.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: wings-valheim-game
-  namespace: game-servers
-  annotations:
-    metallb.universe.tf/address-pool: default
-spec:
-  type: LoadBalancer
-  loadBalancerIP: 10.4.4.205
-  selector:
-    app: wings-valheim
-  ports:
-    - name: game-udp
-      port: 2456
-      targetPort: 2456
-      protocol: UDP
-    - name: game-tcp
-      port: 2456
-      targetPort: 2456
-      protocol: TCP