commit 3662b0e86677f8b5f1c1e26a379fda9c5e42d46f
parent c28a928900e57b4e05efe5cfdc37f56de0166594
Author: MTRNord <mtrnord1@gmail.com>
Date: Fri, 7 Mar 2025 11:41:33 +0100
Use v2.2.0 on draupnirs again
Diffstat:
3 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/apps/base/matrix/draupnir-fluffy/deployment.yaml b/apps/base/matrix/draupnir-fluffy/deployment.yaml
@@ -31,7 +31,7 @@ spec:
app: mjolnir-fluffy
spec:
containers:
- - image: gnuxie/draupnir:develop
+ - image: gnuxie/draupnir:v2.2.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
diff --git a/apps/base/matrix/draupnir-freifunk/deployment.yaml b/apps/base/matrix/draupnir-freifunk/deployment.yaml
@@ -31,7 +31,7 @@ spec:
app: mjolnir-freifunk
spec:
containers:
- - image: gnuxie/draupnir:develop
+ - image: gnuxie/draupnir:v2.2.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
diff --git a/apps/base/matrix/draupnir4all/deployment.yaml b/apps/base/matrix/draupnir4all/deployment.yaml
@@ -40,15 +40,15 @@ spec:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - draupnir4all
+ matchExpressions:
+ - key: app
+ operator: In
+ values:
+ - draupnir4all
topologyKey: "kubernetes.io/hostname"
containers:
- name: draupnir4all
- image: gnuxie/draupnir:develop
+ image: gnuxie/draupnir:v2.2.0
imagePullPolicy: IfNotPresent
#image: ghcr.io/mtrnord/cluster/draupnir:d4all
#imagePullPolicy: Always
@@ -64,57 +64,67 @@ spec:
# - name: TRACING_METRIC_URL
# value: http://tempo.monitoring.svc.cluster.local:4318/v1/metrics
env:
- - name: NODE_OPTIONS
- value: "--trace-warnings"
+ - name: NODE_OPTIONS
+ value: "--trace-warnings"
command: ["./draupnir-entrypoint.sh"]
- args: ["appservice", "-c", "/data/config/config.appservice.yaml", "-f", "/data/config/draupnir-registration.yaml",
- "--draupnir-config", "/data/config/draupnir-config.yaml", "-p", "9000"]
+ args:
+ [
+ "appservice",
+ "-c",
+ "/data/config/config.appservice.yaml",
+ "-f",
+ "/data/config/draupnir-registration.yaml",
+ "--draupnir-config",
+ "/data/config/draupnir-config.yaml",
+ "-p",
+ "9000",
+ ]
resources:
- limits: {}
- requests:
- memory: "344Mi"
- cpu: "252m"
+ limits: {}
+ requests:
+ memory: "344Mi"
+ cpu: "252m"
securityContext:
- runAsUser: 1000
- runAsGroup: 1000
- fsGroup: 1000
- readOnlyRootFilesystem: true
+ runAsUser: 1000
+ runAsGroup: 1000
+ fsGroup: 1000
+ readOnlyRootFilesystem: true
ports:
- - containerPort: 9001
- name: widgets
- protocol: TCP
- - containerPort: 9000
- name: appservice
- protocol: TCP
+ - containerPort: 9001
+ name: widgets
+ protocol: TCP
+ - containerPort: 9000
+ name: appservice
+ protocol: TCP
volumeMounts:
- - name: configs
- mountPath: "/data/config"
- readOnly: true
- - mountPath: /data/storage
- name: storage
- - mountPath: /tmp
- name: tmp
+ - name: configs
+ mountPath: "/data/config"
+ readOnly: true
+ - mountPath: /data/storage
+ name: storage
+ - mountPath: /tmp
+ name: tmp
livenessProbe:
- httpGet:
- path: /healthz
- port: appservice
- scheme: HTTP
- initialDelaySeconds: 15
- periodSeconds: 10
+ httpGet:
+ path: /healthz
+ port: appservice
+ scheme: HTTP
+ initialDelaySeconds: 15
+ periodSeconds: 10
startupProbe:
- httpGet:
- path: /healthz
- port: appservice
- initialDelaySeconds: 15
- failureThreshold: 30
- periodSeconds: 10
+ httpGet:
+ path: /healthz
+ port: appservice
+ initialDelaySeconds: 15
+ failureThreshold: 30
+ periodSeconds: 10
volumes:
- name: configs
secret:
- secretName: draupnir-appservice
+ secretName: draupnir-appservice
- name: storage
persistentVolumeClaim:
- claimName: d4all-persistent-storage
+ claimName: d4all-persistent-storage
- name: tmp
emptyDir:
- sizeLimit: 2048Mi
+ sizeLimit: 2048Mi
