Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ghcr.io/nodebb/nodebb Docker tag to v3.12.4 #172

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
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
4 changes: 2 additions & 2 deletions 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: "TRACE"

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

QUEUE_POP_TIME_MAX: 90
QUEUE_POP_TIME_MAX: 90
4 changes: 2 additions & 2 deletions apps/faf-lobby-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
spec:
terminationGracePeriodSeconds: 3600
containers:
- image: faforever/faf-python-server:v1.15.1
- image: faforever/faf-python-server:new-autolobby-messages
imagePullPolicy: Always
name: faf-lobby-server
envFrom:
Expand Down Expand Up @@ -57,4 +57,4 @@ spec:
volumes:
- name: faf-lobby-server
configMap:
name: faf-lobby-server
name: faf-lobby-server
26 changes: 26 additions & 0 deletions apps/faf-user-service/templates/config-hydra2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: faf-user-service-hydra2
labels:
app: faf-user-service-hydra2
data:
# Only for testing environments
FAF_ENVIRONMENT: {{ eq .Values.environment "prod" | ternary "" .Values.environment }}
REAL_IP_HEADER: "Cf-Connecting-Ip"
PASSWORD_RESET_URL: "https://www.{{.Values.baseDomain}}/account/password/reset"
REGISTER_ACCOUNT_URL: "https://www.{{.Values.baseDomain}}/account/register"
ACTIVATION_URL_FORMAT: "https://user.{{.Values.baseDomain}}/register/activate?token=%s"
FAILED_LOGIN_ACCOUNT_THRESHOLD: "5"
FAILED_LOGIN_ATTEMPT_THRESHOLD: "10"
FAILED_LOGIN_THROTTLING_MINUTES: "5"
FAILED_LOGIN_DAYS_TO_CHECK: "1"
HYDRA_TOKEN_ISSUER: "https://login.{{.Values.baseDomain}}"
HYDRA_JWKS_URL: "https://login.{{.Values.baseDomain}}/.well-known/jwks.json"
HYDRA_BASE_ADMIN_URL: "http://ory-hydra2:4445"
DB_URL: "jdbc:mariadb://mariadb:3306/faf_lobby?ssl=false"
DB_USERNAME: "faf-user-service"
DB_DATABASE: "faf_lobby" # for mariadb init script
LOBBY_URL: "wss://ws.{{.Values.baseDomain}}"
IRC_TOKEN_TTL: "300"
JAVA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
56 changes: 56 additions & 0 deletions apps/faf-user-service/templates/deployment-hydra2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# This is for temporary running Ory Hydra 1.10 and 2.x in parallel.
apiVersion: apps/v1
kind: Deployment
metadata:
name: faf-user-service-hydra2
labels:
app: faf-user-service-hydra2
annotations:
reloader.stakater.com/auto: "true"
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
app: faf-user-service-hydra2
template:
metadata:
labels:
app: faf-user-service-hydra2
annotations:
prometheus.io/scrape: 'true'
prometheus.io/port: '8081'
prometheus.io/path: '/actuator/prometheus'
spec:
containers:
- image: faforever/faf-user-service:3.2.0-RC2
imagePullPolicy: Always
name: faf-user-service
envFrom:
- configMapRef:
name: faf-user-service-hydra2
- secretRef:
name: faf-user-service
volumeMounts:
- name: mail-templates
mountPath: /config/mail/
readOnly: true
ports:
- containerPort: 8080
startupProbe:
httpGet:
port: 8080
path: /q/health
failureThreshold: 10
periodSeconds: 3
livenessProbe:
httpGet:
port: 8080
path: /q/health
failureThreshold: 3
periodSeconds: 10
restartPolicy: Always
volumes:
- name: mail-templates
configMap:
name: faf-user-service-mail-templates
6 changes: 6 additions & 0 deletions apps/faf-user-service/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ spec:
services:
- name: faf-user-service
port: 8080
# This is for temporary running Ory Hydra 1.10 and 2.x in parallel.
- match: Host(`user-nx.{{.Values.baseDomain}}`)
kind: Rule
services:
- name: faf-user-service-hydra2
port: 8080
13 changes: 13 additions & 0 deletions apps/faf-user-service/templates/service-hydra2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This is for temporary running Ory Hydra 1.10 and 2.x in parallel.
apiVersion: v1
kind: Service
metadata:
name: faf-user-service-hydra2
labels:
app: faf-user-service-hydra2
spec:
selector:
app: faf-user-service-hydra2
ports:
- port: 8080
targetPort: 8080
2 changes: 1 addition & 1 deletion apps/nodebb/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
- mountPath: /data/plugins
name: plugins
containers:
- image: ghcr.io/nodebb/nodebb:3.12.3
- image: ghcr.io/nodebb/nodebb:3.12.4
imagePullPolicy: Always
name: nodebb
volumeMounts:
Expand Down
3 changes: 3 additions & 0 deletions apps/ory-hydra2/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
apiVersion: v2
name: ory-hydra2
version: 1.0.0
16 changes: 16 additions & 0 deletions apps/ory-hydra2/templates/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: ory-hydra2
namespace: faf-apps
labels:
app: ory-hydra2
data:
URLS_SELF_ISSUER: "https://login.{{.Values.baseDomain}}"
URLS_LOGIN: "https://user-nx.{{.Values.baseDomain}}/oauth2/login"
URLS_CONSENT: "https://user-nx.{{.Values.baseDomain}}/oauth2/consent"
STRATEGIES_ACCESS_TOKEN: "jwt"
OAUTH2_CLIENT_CREDENTIALS_DEFAULT_GRANT_ALLOWED_SCOPE: "true"
# These are only used for postgres init script, it is redundant in the DSN secret! Don't forget to also create a secret for DB_PASSWORD
DB_USER: "hydra"
DB_NAME: "ory-hydra"
35 changes: 35 additions & 0 deletions apps/ory-hydra2/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: ory-hydra2
namespace: faf-apps
labels:
app: ory-hydra2
annotations:
reloader.stakater.com/auto: "true"
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
app: ory-hydra2
template:
metadata:
labels:
app: ory-hydra2
annotations:
prometheus.io/scrape: 'false'
spec:
containers:
- image: oryd/hydra:v2.2.0
imagePullPolicy: Always
name: ory-hydra2
envFrom:
- configMapRef:
name: ory-hydra2
- secretRef:
name: ory-hydra2
ports:
- containerPort: 4444
- containerPort: 4445
restartPolicy: Always
13 changes: 13 additions & 0 deletions apps/ory-hydra2/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: ory-hydra2
spec:
entryPoints:
- websecure
routes:
- match: Host(`login.{{.Values.baseDomain}}`)
kind: Rule
services:
- name: ory-hydra2
port: 4444
35 changes: 35 additions & 0 deletions apps/ory-hydra2/templates/migration-cronjob.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
kind: CronJob
apiVersion: batch/v1
metadata:
name: ory-hydra2-migration
namespace: faf-apps
labels:
app: ory-hydra-migration
spec:
# Disabled because triggered manually
schedule: "0 0 31 2 *"
suspend: true
concurrencyPolicy: Forbid
jobTemplate:
metadata:
labels:
app: ory-hydra2-migration
annotations:
prometheus.io/scrape: 'false'
spec:
template:
spec:
containers:
- image: oryd/hydra:v2.2.0
imagePullPolicy: Always
name: ory-hydra
envFrom:
- configMapRef:
name: ory-hydra2
- secretRef:
name: ory-hydra2
ports:
- containerPort: 4444
- containerPort: 4445
args: [ "migrate", "sql", "--read-from-env", "--yes"]
restartPolicy: Never
19 changes: 19 additions & 0 deletions apps/ory-hydra2/templates/secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: secrets.infisical.com/v1alpha1
kind: InfisicalSecret
metadata:
name: ory-hydra2
namespace: faf-apps
spec:
authentication:
universalAuth:
credentialsRef:
secretName: infisical-machine-identity
secretNamespace: faf-ops
secretsScope:
projectSlug: {{.Values.infisical.projectSlug}}
envSlug: {{.Values.infisical.envSlug}}
secretsPath: "/ory-hydra2"
managedSecretReference:
secretName: ory-hydra2
secretNamespace: faf-apps
creationPolicy: "Owner"
17 changes: 17 additions & 0 deletions apps/ory-hydra2/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
kind: Service
metadata:
name: ory-hydra2
namespace: faf-apps
labels:
app: ory-hydra2
spec:
selector:
app: ory-hydra2
ports:
- name: public-port
port: 4444
targetPort: 4444
- name: admin-port
port: 4445
targetPort: 4445
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.20.2
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
1 change: 1 addition & 0 deletions scripts/init-postgres.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@ create_user_and_db() {
}

create_user_and_db faf-apps wikijs DB_USER DB_PASS DB_NAME
create_user_and_db faf-apps ory-hydra2 DB_USER DB_PASSWORD DB_NAME

echo "All users and databases have been processed."