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 mongo Docker tag to v8 #115

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
2 changes: 1 addition & 1 deletion apps/faf-api/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
prometheus.io/path: '/actuator/prometheus'
spec:
containers:
- image: faforever/faf-java-api:v3.4.7
- image: faforever/faf-java-api:v3.5.0
imagePullPolicy: Always
name: faf-api
envFrom:
Expand Down
23 changes: 18 additions & 5 deletions apps/nodebb/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ spec:
spec:
initContainers:
- name: permission-init
image: alpine:3.16.0
image: alpine/git
command:
- sh
- -c
- chown -R 1000:1000 /data/* && chmod 775 /data/* && ls -lah /data
{{/* FOR SSO PLUGIN DEVELOPMENT ONLY: (afterwards still needs rebuild&restart from admin panel) */}}
{{/* - git clone https://github.com/FAForever/nodebb-plugin-sso-oauth-faforever /data/plugins/sso-faforever && chown -R 1001:1001 /data/* && chmod 775 /data/* && ls -lah /data*/}}
- chown -R 1001:1001 /data/* && chmod 775 /data/* && ls -lah /data
volumeMounts:
- mountPath: /data/node_modules
name: nodebb
Expand All @@ -32,12 +34,14 @@ spec:
- mountPath: /data/uploads
name: nodebb
subPath: uploads
- mountPath: /data/plugins
name: plugins
containers:
- image: nodebb/docker:1.19.12
- image: ghcr.io/nodebb/nodebb:3.10.3
imagePullPolicy: Always
name: nodebb
volumeMounts:
- mountPath: /usr/src/app/config.json
- mountPath: /opt/config/config.json
name: config
subPath: config.json
- mountPath: /usr/src/app/node_modules
Expand All @@ -49,6 +53,13 @@ spec:
- mountPath: /usr/src/app/public/uploads
name: nodebb
subPath: uploads
{{/* FOR SSO PLUGIN DEVELOPMENT ONLY: (afterwards still needs rebuild&restart from admin panel) */}}
{{/* - mountPath: /usr/src/app/local-plugins*/}}
{{/* name: plugins*/}}
{{/* lifecycle:*/}}
{{/* postStart:*/}}
{{/* exec:*/}}
{{/* command: [npm i -f --prefix /usr/src/app/local-plugins/sso-faforever && npm i /usr/src/app/local-plugins/sso-faforever]*/}}
restartPolicy: Always
volumes:
- name: config
Expand All @@ -57,5 +68,7 @@ spec:
- name: nodebb
persistentVolumeClaim:
claimName: nodebb-pvc
- name: plugins
emptyDir: {}
securityContext:
fsGroup: 1000
fsGroup: 1001
35 changes: 35 additions & 0 deletions cluster/argocd/templates/argocd-styles.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: argocd-styles-cm
data:
production-theme.css: |
.sidebar {
background: linear-gradient(to bottom, #660f0f, #100403);
}

.ui-banner {
background: linear-gradient(to right, #660f0f, #100403);
color: #fff;
}

test-theme.css: |
.sidebar {
background: linear-gradient(to bottom, #0f660f, #100403);
}

.ui-banner {
background: linear-gradient(to right, #0f660f, #100403);
color: #fff;
}

another-theme.css: |
.sidebar {
background: linear-gradient(to bottom, #0f660f, #100403);
}

.ui-banner {
background: linear-gradient(to right, #0f660f, #100403);
color: #fff;
}
6 changes: 6 additions & 0 deletions cluster/argocd/values-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ argo-cd:
# -- Timeout to discover if a new manifests version got published to the repository
timeout.reconciliation: 180s

# Custom theme
ui.cssurl: "./custom/test-theme.css"
ui.bannercontent: "Test FAF cluster. Be careful."
ui.bannerpermanent: true
ui.bannerposition: "top"

dex.config: |
connectors:
- type: github
Expand Down
11 changes: 1 addition & 10 deletions cluster/argocd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,7 @@ argo-cd:
networkPolicy:
create: true

server:

config:
resource.customizations: |-
networking.k8s.io/Ingress:
health.lua: |
hs = {}
hs.status = "Healthy"
return hs

server:
# Avoids a permanent out of sync situation with Ingress resources
metrics:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion infra/mongodb/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
app: mongodb
spec:
containers:
- image: mongo:7.0.14
- image: mongo:8.0.3
imagePullPolicy: Always
name: mongodb
ports:
Expand Down