diff --git a/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml b/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml index 425adcf21..e7b31f4ca 100644 --- a/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml +++ b/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml @@ -133,8 +133,8 @@ data: omni-tools IN CNAME traefik-cl01tl paperless-ngx IN CNAME traefik-cl01tl plex IN CNAME traefik-cl01tl - postiz-temporal-web IN CNAME traefik-cl01tl - postiz-temporal-frontend IN CNAME traefik-cl01tl + postiz-spotlight IN CNAME traefik-cl01tl + postiz-temporal IN CNAME traefik-cl01tl prometheus IN CNAME traefik-cl01tl prowlarr IN CNAME traefik-cl01tl qbittorrent IN CNAME traefik-cl01tl diff --git a/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml b/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml index cb490e343..d1779f68d 100644 --- a/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml +++ b/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/configMaps: 9ab7e5369778f4b51444322c2305b31ab86165ce8f4e1e9f9ccd32d216b5a18a + checksum/configMaps: 8676326dff8b7d48ce6e6795980f0de8eebea677b39f083c9c6776c96145ae76 labels: app.kubernetes.io/controller: main app.kubernetes.io/instance: blocky diff --git a/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml b/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml index a907619fc..8645510ca 100644 --- a/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml +++ b/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml @@ -247,8 +247,8 @@ data: - '[CERTIFICATE_EXPIRATION] > 240h' group: core interval: 30s - name: postiz-temporal-web - url: https://postiz-temporal-web.alexlebens.net + name: postiz-spotlight + url: https://postiz-spotlight.alexlebens.net - alerts: - type: ntfy conditions: @@ -256,8 +256,8 @@ data: - '[CERTIFICATE_EXPIRATION] > 240h' group: core interval: 30s - name: postiz-temporal-frontend - url: https://postiz-temporal-frontend.alexlebens.net + name: postiz-temporal + url: https://postiz-temporal.alexlebens.net - alerts: - type: ntfy conditions: diff --git a/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml b/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml index f533897d0..654412d2a 100644 --- a/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml +++ b/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml @@ -26,7 +26,7 @@ spec: app.kubernetes.io/name: gatus app.kubernetes.io/instance: gatus annotations: - checksum/config: 925ec65c11f442de627db0ed4201ea7e47302023a57d7420efd4c32d4c738175 + checksum/config: 8d10052fb98f3843a3d7c22afe1c9536b88255f3f791d2213d4b9a86a6bbb7a3 spec: serviceAccountName: default automountServiceAccountToken: false diff --git a/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml b/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml index ae9eadd82..bf8944e17 100644 --- a/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml +++ b/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml @@ -274,17 +274,17 @@ data: href: https://home-assistant-code-server.alexlebens.net siteMonitor: http://home-assistant-code-server.home-assistant:8443 statusStyle: dot - - Temporal Web (Postiz): - icon: https://raw.githubusercontent.com/temporalio/documentation/47b489b69d7c7ee4c3a0880cc0faf11b5f4cdb2a/static/img/favicon.svg - description: Temporal Web - href: https://postiz-temporal-web.alexlebens.net - siteMonitor: http://postiz-temporal-web.postiz:8080 + - Spotlight (Postiz): + icon: https://raw.githubusercontent.com/getsentry/spotlight/c528fc752edde40f008282dc7c8ff1568e58c40b/packages/website/public/favicon.svg + description: Sentry monitoring for Postiz + href: https://postiz-spotlight.alexlebens.net + siteMonitor: http://postiz-spotlight.postiz:8969 statusStyle: dot - - Temporal Frontend (Postiz): + - Temporal (Postiz): icon: https://raw.githubusercontent.com/temporalio/documentation/47b489b69d7c7ee4c3a0880cc0faf11b5f4cdb2a/static/img/favicon.svg - description: Temporal Frontend - href: https://postiz-temporal-frontend.alexlebens.net - siteMonitor: http://postiz-temporal-frontend.postiz:7243 + description: Temporal monitoring for Postiz + href: https://postiz-temporal.alexlebens.net + siteMonitor: http://postiz-temporal-web.postiz:8080 statusStyle: dot - Automation: - Continuous Deployment: diff --git a/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml b/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml index 20a688407..22b5ac625 100644 --- a/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml +++ b/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/configMaps: dcdecef21cd4e565293d228f501825ea8328bbe82e442c0aa4960676b7910742 + checksum/configMaps: a133cd4cc8547a918ea54419942820bf9992daa2279898d42862a0bedf99cd5a checksum/secrets: d3ba83f111cd32f92c909268c55ad8bbd4f9e299b74b35b33c1a011180d8b378 labels: app.kubernetes.io/controller: main diff --git a/clusters/cl01tl/manifests/postiz/Deployment-postiz-main.yaml b/clusters/cl01tl/manifests/postiz/Deployment-postiz-main.yaml index 206fe6672..8fac3a8ae 100644 --- a/clusters/cl01tl/manifests/postiz/Deployment-postiz-main.yaml +++ b/clusters/cl01tl/manifests/postiz/Deployment-postiz-main.yaml @@ -99,9 +99,9 @@ spec: - name: POSTIZ_OAUTH_SCOPE value: openid profile email - name: NEXT_PUBLIC_SENTRY_DSN - value: http://postiz-spotlight:8969/stream + value: http://key@postiz-spotlight.postiz:8969/1 - name: SENTRY_SPOTLIGHT - value: "1" + value: http://postiz-spotlight.postiz:8969/stream image: ghcr.io/gitroomhq/postiz-app:v2.21.4@sha256:a339e9ee256537526d0eda19e5919e01fa7649a40596ebec5d9e1389850836bc name: main resources: diff --git a/clusters/cl01tl/manifests/postiz/Deployment-postiz-spotlight.yaml b/clusters/cl01tl/manifests/postiz/Deployment-postiz-spotlight.yaml index 04962505d..29dd3f77b 100644 --- a/clusters/cl01tl/manifests/postiz/Deployment-postiz-spotlight.yaml +++ b/clusters/cl01tl/manifests/postiz/Deployment-postiz-spotlight.yaml @@ -38,5 +38,5 @@ spec: name: main resources: requests: - cpu: 10m - memory: 40Mi + cpu: 1m + memory: 100Mi diff --git a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-admintools.yaml b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-admintools.yaml index 236bc2823..58a4d7f27 100644 --- a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-admintools.yaml +++ b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-admintools.yaml @@ -50,4 +50,4 @@ spec: resources: requests: cpu: 10m - memory: 60Mi + memory: 10Mi diff --git a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-frontend.yaml b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-frontend.yaml index d489e584e..31657c21c 100644 --- a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-frontend.yaml +++ b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-frontend.yaml @@ -97,7 +97,7 @@ spec: resources: requests: cpu: 10m - memory: 60Mi + memory: 50Mi volumes: - name: shims configMap: diff --git a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-history.yaml b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-history.yaml index 1726a0f35..a75d38f39 100644 --- a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-history.yaml +++ b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-history.yaml @@ -90,7 +90,7 @@ spec: resources: requests: cpu: 10m - memory: 60Mi + memory: 200Mi volumes: - name: shims configMap: diff --git a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-web.yaml b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-web.yaml index 8a467d110..a9a8f0c15 100644 --- a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-web.yaml +++ b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-web.yaml @@ -54,4 +54,4 @@ spec: resources: requests: cpu: 10m - memory: 60Mi + memory: 50Mi diff --git a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-worker.yaml b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-worker.yaml index cd4da4618..975d2137d 100644 --- a/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-worker.yaml +++ b/clusters/cl01tl/manifests/postiz/Deployment-postiz-temporal-worker.yaml @@ -83,7 +83,7 @@ spec: resources: requests: cpu: 10m - memory: 60Mi + memory: 50Mi volumes: - name: shims configMap: diff --git a/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz-temporal-web.yaml b/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz-temporal-web.yaml index 68066f64a..21f155c0d 100644 --- a/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz-temporal-web.yaml +++ b/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz-temporal-web.yaml @@ -14,7 +14,7 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - postiz-temporal-web.alexlebens.net + - postiz-temporal.alexlebens.net rules: - matches: - path: diff --git a/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz-temporal-frontend.yaml b/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz.yaml similarity index 54% rename from clusters/cl01tl/manifests/postiz/HTTPRoute-postiz-temporal-frontend.yaml rename to clusters/cl01tl/manifests/postiz/HTTPRoute-postiz.yaml index 8eff011a3..2e780179c 100644 --- a/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz-temporal-frontend.yaml +++ b/clusters/cl01tl/manifests/postiz/HTTPRoute-postiz.yaml @@ -1,12 +1,13 @@ apiVersion: gateway.networking.k8s.io/v1 kind: HTTPRoute metadata: - name: postiz-temporal-frontend - namespace: postiz + name: postiz labels: - app.kubernetes.io/name: postiz-temporal-frontend app.kubernetes.io/instance: postiz - app.kubernetes.io/part-of: postiz + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: postiz + helm.sh/chart: postiz-4.6.2 + namespace: postiz spec: parentRefs: - group: gateway.networking.k8s.io @@ -14,15 +15,16 @@ spec: name: traefik-gateway namespace: traefik hostnames: - - postiz-temporal-frontend.alexlebens.net + - "postiz-spotlight.alexlebens.net" rules: - - matches: + - backendRefs: + - group: "" + kind: Service + name: postiz-spotlight + namespace: postiz + port: 8969 + weight: 1 + matches: - path: type: PathPrefix value: / - backendRefs: - - group: '' - kind: Service - name: postiz-temporal-frontend - port: 7243 - weight: 100 diff --git a/clusters/cl01tl/manifests/postiz/Job-postiz-temporal-schema-1-0-0-rc-3-1.yaml b/clusters/cl01tl/manifests/postiz/Job-postiz-temporal-schema-1-0-0-rc-3-1.yaml index cf90946c7..1c2e0c10a 100644 --- a/clusters/cl01tl/manifests/postiz/Job-postiz-temporal-schema-1-0-0-rc-3-1.yaml +++ b/clusters/cl01tl/manifests/postiz/Job-postiz-temporal-schema-1-0-0-rc-3-1.yaml @@ -128,6 +128,14 @@ spec: - name: shims mountPath: /usr/local/sbin/temporal-elasticsearch-tool subPath: temporal-elasticsearch-tool + - name: create-default-namespace + image: "temporalio/admin-tools:1.30.3@sha256:2c2272b008f1af295b3719963e6feeef64f838d1105d895cf6acfcf96dd31741" + imagePullPolicy: IfNotPresent + command: ['/bin/sh', '-c'] + args: ['temporal operator namespace describe -n default || temporal operator namespace create -n default --retention 30d'] + env: + - name: TEMPORAL_ADDRESS + value: "postiz-temporal-frontend.postiz.svc:7233" containers: - name: done image: "temporalio/admin-tools:1.30.3@sha256:2c2272b008f1af295b3719963e6feeef64f838d1105d895cf6acfcf96dd31741"