From dd2c9160aaa5fdf3271813be897c35bd32ae664e Mon Sep 17 00:00:00 2001 From: bp99 Date: Tue, 6 May 2025 23:23:40 +0200 Subject: [PATCH] Adapt example configs to urban terror --- config.yaml | 22 +++++---------------- example.yaml | 48 +++++++++++++++++---------------------------- examples/fleet.yaml | 42 ++++++++++++++------------------------- 3 files changed, 38 insertions(+), 74 deletions(-) diff --git a/config.yaml b/config.yaml index 9db2d34..dd48b3f 100644 --- a/config.yaml +++ b/config.yaml @@ -3,32 +3,20 @@ timeLimit: 15m bot: minPlayers: 3 game: - motd: "Welcome to Critical Stack" + motd: "Welcome to my UrT Server" type: FreeForAll forceRespawn: false inactivity: 10m - #password: "letmein" - quadFactor: 3 - weaponRespawn: 3 + # password: "letmein" server: hostname: "quakekube" maxClients: 16 - password: "changeme" + # password: "changeme" commands: - addbot sarge 2 maps: -- name: q3dm7 +- name: ut4_uptown type: FreeForAll timeLimit: 10m -- name: q3dm17 +- name: ut4_swim type: FreeForAll -- name: q3wctf1 - type: CaptureTheFlag - captureLimit: 8 -- name: q3tourney2 - type: Tournament -- name: q3wctf3 - type: CaptureTheFlag - captureLimit: 8 -- name: ztn3tourney1 - type: Tournament diff --git a/example.yaml b/example.yaml index 1fe6ff6..7864ad6 100644 --- a/example.yaml +++ b/example.yaml @@ -1,16 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: quake + name: urbanterror spec: selector: matchLabels: - run: quake + run: urbanterror replicas: 1 template: metadata: labels: - run: quake + run: urbanterror annotations: prometheus.io/scrape: 'true' prometheus.io/port: '8080' @@ -22,7 +22,7 @@ spec: - --config=/config/config.yaml - --content-server=http://127.0.0.1:9090 - --agree-eula - image: docker.io/criticalstack/quake:latest + image: gitea.bp99.eu/bzp99/urban-terror-server:latest name: server ports: - containerPort: 8080 @@ -32,36 +32,36 @@ spec: initialDelaySeconds: 15 periodSeconds: 5 volumeMounts: - - name: quake3-server-config + - name: server-config mountPath: /config - - name: quake3-content + - name: content mountPath: /assets - command: - q3 - content - --seed-content-url=http://content.quakejs.com - image: docker.io/criticalstack/quake:latest + image: gitea.bp99.eu/bzp99/urban-terror-server:latest name: content-server ports: - containerPort: 9090 volumeMounts: - - name: quake3-content + - name: content mountPath: /assets volumes: - - name: quake3-server-config + - name: server-config configMap: - name: quake3-server-config - - name: quake3-content + name: server-config + - name: content emptyDir: {} --- apiVersion: v1 kind: Service metadata: - name: quake + name: urbanterror spec: type: NodePort selector: - run: quake + run: urbanterror ports: - port: 8080 targetPort: 8080 @@ -79,7 +79,7 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - name: quake3-server-config + name: server-config data: config.yaml: | fragLimit: 25 @@ -87,31 +87,19 @@ data: bot: minPlayers: 3 game: - motd: "Welcome to Critical Stack" + motd: "Welcome to my Urban Terror server" type: FreeForAll forceRespawn: false inactivity: 10m - quadFactor: 3 - weaponRespawn: 3 server: hostname: "quakekube" maxClients: 12 - password: "changeme" + # password: "changeme" commands: - addbot sarge 2 maps: - - name: q3dm7 + - name: ut4_uptown type: FreeForAll timeLimit: 10m - - name: q3dm17 + - name: ut4_swim type: FreeForAll - - name: q3wctf1 - type: CaptureTheFlag - captureLimit: 8 - - name: q3tourney2 - type: Tournament - - name: q3wctf3 - type: CaptureTheFlag - captureLimit: 8 - - name: ztn3tourney1 - type: Tournament diff --git a/examples/fleet.yaml b/examples/fleet.yaml index bc9f9b9..6938a8f 100644 --- a/examples/fleet.yaml +++ b/examples/fleet.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: quake3-server-config + name: server-config data: config.yaml: | fragLimit: 25 @@ -10,39 +10,27 @@ data: bot: minPlayers: 3 game: - motd: "Welcome to Critical Stack" + motd: "Welcome to my Urban Terror server" type: FreeForAll forceRespawn: false inactivity: 10m - quadFactor: 3 - weaponRespawn: 3 server: hostname: "quakekube" maxClients: 12 - password: "changeme" + # password: "changeme" commands: - addbot sarge 2 maps: - - name: q3dm7 + - name: ut4_uptown type: FreeForAll timeLimit: 10m - - name: q3dm17 + - name: ut4_swim type: FreeForAll - - name: q3wctf1 - type: CaptureTheFlag - captureLimit: 8 - - name: q3tourney2 - type: Tournament - - name: q3wctf3 - type: CaptureTheFlag - captureLimit: 8 - - name: ztn3tourney1 - type: Tournament --- apiVersion: "agones.dev/v1" kind: Fleet metadata: - name: octops + name: urbanterror labels: cluster: gke-1.17 region: us-east-1 @@ -74,7 +62,7 @@ spec: containers: - name: gameserver imagePullPolicy: Always - image: octops/quake:latest + image: gitea.bp99.eu/bzp99/urban-terror-server:latest command: - q3 - server @@ -98,13 +86,13 @@ spec: memory: "2Gi" cpu: "1" volumeMounts: - - name: quake3-server-config + - name: server-config mountPath: /config - - name: quake3-content + - name: content mountPath: /assets - name: content-server imagePullPolicy: Always - image: octops/quake:latest + image: gitea.bp99.eu/bzp99/urban-terror-server:latest command: - q3 - content @@ -119,11 +107,11 @@ spec: memory: "2Gi" cpu: "1" volumeMounts: - - name: quake3-content + - name: content mountPath: /assets volumes: - - name: quake3-server-config + - name: server-config configMap: - name: quake3-server-config - - name: quake3-content - emptyDir: {} \ No newline at end of file + name: server-config + - name: content + emptyDir: {}