Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/faf-icebreaker/templates/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ data:
RABBITMQ_HOST: "rabbitmq"
RABBITMQ_USER: "faf-icebreaker"
RABBITMQ_PORT: "5672"
CLOUDFLARE_ENABLED: "false"
CLOUDFLARE_ENABLED: "true"
XIRSYS_ENABLED: "true"
XIRSYS_TURN_ENABLED: "true"
GEOIPUPDATE_EDITION_IDS: "GeoLite2-City"
LOKI_BASE_URL: "http://monitoring-loki-gateway.faf-ops.svc"
FORCE_RELAY: "false"
QUARKUS_LOG_CATEGORY__COM_FAFOREVER__LEVEL: "DEBUG"
FORCE_RELAY: "true"
REAL_IP_HEADER: "Cf-Connecting-Ip"
QUARKUS_LOG_CATEGORY__COM_FAFOREVER__LEVEL: "TRACE"
2 changes: 1 addition & 1 deletion apps/faf-icebreaker/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
- name: geolite-db
mountPath: /usr/share/GeoIP
containers:
- image: faforever/faf-icebreaker:1.1.9
- image: faforever/faf-icebreaker:1.2.0-RC4
imagePullPolicy: Always
name: faf-icebreaker
envFrom:
Expand Down
1 change: 1 addition & 0 deletions apps/faf-icebreaker/templates/local-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ stringData:
RABBITMQ_PASSWORD: "banana"
XIRSYS_IDENT: "banana"
XIRSYS_SECRET: "banana"
HETZNER_API_KEY: "banana"
JWT_PRIVATE_KEY_PATH: |-
-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDXsCsl9W0vnW2k
Expand Down
2 changes: 1 addition & 1 deletion apps/faf-legacy-deployment/scripts/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
implementation("org.eclipse.jgit:org.eclipse.jgit:7.5.0.202512021534-r")
implementation("org.apache.commons:commons-compress:1.28.0")
implementation("org.slf4j:slf4j-api:2.0.13")
implementation("ch.qos.logback:logback-classic:1.5.23")
implementation("ch.qos.logback:logback-classic:1.5.27")
}

// Use the root level for files
Expand Down
5 changes: 4 additions & 1 deletion apps/faf-lobby-server/config/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CONFIGURATION_REFRESH_TIME: 60
LOG_LEVEL: "INFO"
LOG_LEVEL: "DEBUG"

LISTEN:
- ADDRESS:
Expand Down Expand Up @@ -40,6 +40,9 @@ NEWBIE_TIME_BONUS: .25
MAXIMUM_NEWBIE_TIME_BONUS: 3.0
MINORITY_BONUS: 1

LADDER_TOP_PLAYER_SEARCH_EXPANSION_MAX: 1.0
LADDER_TOP_PLAYER_SEARCH_EXPANSION_STEP: 1.0

QUEUE_POP_TIME_MAX: 90

# LADDER_VIOLATIONS_ENABLED: false
4 changes: 2 additions & 2 deletions apps/faf-replay-server/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ storage:
replay:
forced_timeout_s: 18000
time_with_zero_writers_to_end_replay_s: 30
delay_s: 300
delay_s: 30
update_interval_s: 1
merge_quorum_size: 2
stream_comparison_distance_b: 4096
stream_comparison_distance_b: 4096
6 changes: 6 additions & 0 deletions cluster/storage/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ managedStorages:
size: 500Gi
pvc:
namespace: faf-apps
- pv:
name: faf-replays-old
folderName: replays-old
size: 500Gi
pvc:
namespace: faf-apps
- pv:
name: faf-maps
folderName: maps
Expand Down
7 changes: 7 additions & 0 deletions cluster/telepresence/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: v2
name: telepresence
version: 1.0.0
dependencies:
- name: telepresence-oss
version: 2.25.1
repository: oci://ghcr.io/telepresenceio
3 changes: 3 additions & 0 deletions cluster/telepresence/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
namespace: telepresence
telepresence:
releaseName: traffic-manager
9 changes: 6 additions & 3 deletions ops/monitoring/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ dependencies:
- name: victoria-metrics-k8s-stack
version: 0.60.1
repository: https://victoriametrics.github.io/helm-charts/
- name: promtail
version: 6.17.0
repository: https://grafana.github.io/helm-charts
- name: loki
version: 6.40.0
repository: https://grafana.github.io/helm-charts
- name: k8s-monitoring
version: 3.5.1
repository: https://grafana.github.io/helm-charts
- name: k8s-monitoring
version: 3.5.1
repository: https://grafana.github.io/helm-charts
3 changes: 3 additions & 0 deletions ops/monitoring/values-prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
k8s-monitoring:
cluster:
name: faforever-com
3 changes: 3 additions & 0 deletions ops/monitoring/values-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
k8s-monitoring:
cluster:
name: faforever-xyz
36 changes: 27 additions & 9 deletions ops/monitoring/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ victoria-metrics-k8s-stack:
loki:

deploymentMode: SingleBinary
singleBinary:
replicas: 1

# Disable Simple Scalable
read:
Expand Down Expand Up @@ -131,9 +129,6 @@ loki:
limits_config:
retention_period: 168h

limits_config:
retention_period: 168h

# We know it's working
test:
enabled: false
Expand All @@ -145,7 +140,30 @@ loki:
chunksCache:
enabled: false

promtail:
config:
clients:
- url: http://monitoring-loki-gateway/loki/api/v1/push
# Disable anti-affinity
singleBinary:
replicas: 1
affinity: null

gateway:
affinity: null


k8s-monitoring:
# Where Alloy pushes data to
# We can add our own Loki, Thanos...
destinations:
- name: local-loki
type: loki
url: http://monitoring-loki-gateway/loki/api/v1/push

# We are using 1% of this chart, just logs for now, as it implements lots of things that vm-stack provides
# We could switch to this + vmsingle

# Collectors
alloy-logs:
enabled: true

# Features
podLogs:
enabled: true