Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dda12f2ca4 | |||
| 8472829ffa | |||
| a68f27b631 | |||
| e47aa0d024 | |||
| 4ef76abbb2 | |||
|
7d231dec88
|
|||
| 81431971c2 | |||
| 1c7c4e9fd8 | |||
|
2b88f9e765
|
|||
|
d48e21ada7
|
@@ -12,7 +12,7 @@ spec:
|
|||||||
name: cluster-fun (v2)
|
name: cluster-fun (v2)
|
||||||
source:
|
source:
|
||||||
repoURL: 'https://stakater.github.io/stakater-charts'
|
repoURL: 'https://stakater.github.io/stakater-charts'
|
||||||
targetRevision: v0.0.129
|
targetRevision: 2.2.12
|
||||||
chart: reloader
|
chart: reloader
|
||||||
syncPolicy:
|
syncPolicy:
|
||||||
automated: {}
|
automated: {}
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
apiVersion: argoproj.io/v1alpha1
|
||||||
|
kind: Application
|
||||||
|
metadata:
|
||||||
|
name: trek
|
||||||
|
namespace: argocd
|
||||||
|
finalizers:
|
||||||
|
- resources-finalizer.argocd.argoproj.io
|
||||||
|
spec:
|
||||||
|
project: cluster.fun
|
||||||
|
destination:
|
||||||
|
namespace: trek
|
||||||
|
name: cluster-fun (v2)
|
||||||
|
source:
|
||||||
|
path: manifests/trek
|
||||||
|
repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
|
||||||
|
targetRevision: HEAD
|
||||||
|
syncPolicy:
|
||||||
|
automated: {}
|
||||||
|
syncOptions:
|
||||||
|
- CreateNamespace=true
|
||||||
|
ignoreDifferences:
|
||||||
|
- kind: Secret
|
||||||
|
jsonPointers:
|
||||||
|
- /data
|
||||||
|
|
||||||
@@ -83,3 +83,20 @@ spec:
|
|||||||
app: internal-proxy
|
app: internal-proxy
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
---
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: hermes
|
||||||
|
namespace: auth-proxy
|
||||||
|
labels:
|
||||||
|
app: internal-proxy
|
||||||
|
spec:
|
||||||
|
ports:
|
||||||
|
- name: http
|
||||||
|
port: 80
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: 8080
|
||||||
|
selector:
|
||||||
|
app: internal-proxy
|
||||||
|
type: ClusterIP
|
||||||
|
---
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ spec:
|
|||||||
- bsky-feeds.cluster.fun
|
- bsky-feeds.cluster.fun
|
||||||
- ai.cluster.fun
|
- ai.cluster.fun
|
||||||
- penpot.cluster.fun
|
- penpot.cluster.fun
|
||||||
- trek.cluster.fun
|
|
||||||
secretName: non-auth-proxy-ingress
|
secretName: non-auth-proxy-ingress
|
||||||
rules:
|
rules:
|
||||||
- host: hello-world.cluster.fun
|
- host: hello-world.cluster.fun
|
||||||
@@ -72,13 +71,3 @@ spec:
|
|||||||
name: tailscale-proxy
|
name: tailscale-proxy
|
||||||
port:
|
port:
|
||||||
name: non-auth
|
name: non-auth
|
||||||
- host: trek.cluster.fun
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: ImplementationSpecific
|
|
||||||
backend:
|
|
||||||
service:
|
|
||||||
name: tailscale-proxy
|
|
||||||
port:
|
|
||||||
name: non-auth
|
|
||||||
|
|||||||
@@ -13,7 +13,9 @@ data:
|
|||||||
"loki.auth-proxy.svc": "loki-write.cluster.local",
|
"loki.auth-proxy.svc": "loki-write.cluster.local",
|
||||||
"loki.auth-proxy.svc:80": "loki-write.cluster.local",
|
"loki.auth-proxy.svc:80": "loki-write.cluster.local",
|
||||||
"loki-distributed.auth-proxy.svc": "loki-loki.cluster.local",
|
"loki-distributed.auth-proxy.svc": "loki-loki.cluster.local",
|
||||||
"loki-distributed.auth-proxy.svc:80": "loki-loki.cluster.local"
|
"loki-distributed.auth-proxy.svc:80": "loki-loki.cluster.local",
|
||||||
|
"hermes.auth-proxy.svc": "hermes.cluster.local",
|
||||||
|
"hermes.auth-proxy.svc:80": "hermes.cluster.local"
|
||||||
}
|
}
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ spec:
|
|||||||
serviceAccountName: promtail
|
serviceAccountName: promtail
|
||||||
containers:
|
containers:
|
||||||
- name: promtail
|
- name: promtail
|
||||||
image: "grafana/promtail:3.6.11"
|
image: "grafana/promtail:2.9.17"
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
args:
|
args:
|
||||||
- "-config.file=/etc/promtail/promtail.yaml"
|
- "-config.file=/etc/promtail/promtail.yaml"
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ spec:
|
|||||||
priorityClassName: critical
|
priorityClassName: critical
|
||||||
containers:
|
containers:
|
||||||
- name: nextcloud
|
- name: nextcloud
|
||||||
image: "nextcloud:33.0.4-apache"
|
image: "nextcloud:33.0.5-apache"
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: SQLITE_DATABASE
|
- name: SQLITE_DATABASE
|
||||||
@@ -340,7 +340,7 @@ spec:
|
|||||||
mountPath: /var/www/html/config/smtp.config.php
|
mountPath: /var/www/html/config/smtp.config.php
|
||||||
subPath: smtp.config.php
|
subPath: smtp.config.php
|
||||||
- name: cron
|
- name: cron
|
||||||
image: "nextcloud:33.0.4-apache"
|
image: "nextcloud:33.0.5-apache"
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
command:
|
command:
|
||||||
- /cron.sh
|
- /cron.sh
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ spec:
|
|||||||
- name: data
|
- name: data
|
||||||
mountPath: /data
|
mountPath: /data
|
||||||
- name: update-native-modules
|
- name: update-native-modules
|
||||||
image: nodered/node-red:4.1.10-18
|
image: nodered/node-red:4.1.11-18
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
command:
|
command:
|
||||||
- bash
|
- bash
|
||||||
@@ -73,7 +73,7 @@ spec:
|
|||||||
mountPath: /data
|
mountPath: /data
|
||||||
containers:
|
containers:
|
||||||
- name: web
|
- name: web
|
||||||
image: nodered/node-red:4.1.10-18
|
image: nodered/node-red:4.1.11-18
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 1880
|
- containerPort: 1880
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ spec:
|
|||||||
priorityClassName: critical
|
priorityClassName: critical
|
||||||
containers:
|
containers:
|
||||||
- name: outline
|
- name: outline
|
||||||
image: outlinewiki/outline:1.7.1
|
image: outlinewiki/outline:1.8.0
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: ALLOWED_DOMAINS
|
- name: ALLOWED_DOMAINS
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
kind: PersistentVolumeClaim
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: trek-data
|
||||||
|
namespace: trek
|
||||||
|
spec:
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteOnce
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 2Gi
|
||||||
|
storageClassName: sbs-default-retain
|
||||||
|
---
|
||||||
|
kind: PersistentVolumeClaim
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: trek-uploads
|
||||||
|
namespace: trek
|
||||||
|
spec:
|
||||||
|
accessModes:
|
||||||
|
- ReadWriteOnce
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 2Gi
|
||||||
|
storageClassName: sbs-default-retain
|
||||||
|
---
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Secret
|
||||||
|
metadata:
|
||||||
|
name: trek
|
||||||
|
namespace: trek
|
||||||
|
labels:
|
||||||
|
app: trek
|
||||||
|
app.kubernetes.io/name: trek
|
||||||
|
annotations:
|
||||||
|
kube-1password: irpjqi7ppvbvldfni7ywgorpgi
|
||||||
|
kube-1password/vault: Kubernetes
|
||||||
|
kube-1password/secret-text-parse: "true"
|
||||||
|
type: Opaque
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: trek
|
||||||
|
namespace: trek
|
||||||
|
labels:
|
||||||
|
app: trek
|
||||||
|
app.kubernetes.io/name: trek
|
||||||
|
annotations:
|
||||||
|
reloader.stakater.com/match: "true"
|
||||||
|
data:
|
||||||
|
NODE_ENV: "production"
|
||||||
|
PORT: "3000"
|
||||||
|
TZ: "UTC"
|
||||||
|
LOG_LEVEL: "info"
|
||||||
|
DEFAULT_LANGUAGE: "en"
|
||||||
|
ALLOWED_ORIGINS: "https://trek.cluster.fun"
|
||||||
|
APP_URL: "https://trek.cluster.fun"
|
||||||
|
FORCE_HTTPS: "false"
|
||||||
|
COOKIE_SECURE: "true"
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: trek
|
||||||
|
namespace: trek
|
||||||
|
labels:
|
||||||
|
app: trek
|
||||||
|
app.kubernetes.io/name: trek
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
strategy:
|
||||||
|
type: Recreate
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: trek
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: trek
|
||||||
|
app.kubernetes.io/name: trek
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: trek
|
||||||
|
image: mauriceboe/trek:3.0.22
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
envFrom:
|
||||||
|
- configMapRef:
|
||||||
|
name: trek
|
||||||
|
- secretRef:
|
||||||
|
name: trek
|
||||||
|
ports:
|
||||||
|
- containerPort: 3000
|
||||||
|
name: web
|
||||||
|
volumeMounts:
|
||||||
|
- mountPath: /app/data
|
||||||
|
name: data
|
||||||
|
- mountPath: /app/uploads
|
||||||
|
name: uploads
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /api/health
|
||||||
|
port: 3000
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
periodSeconds: 30
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /api/health
|
||||||
|
port: 3000
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
periodSeconds: 10
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 100m
|
||||||
|
memory: 256Mi
|
||||||
|
limits:
|
||||||
|
cpu: 500m
|
||||||
|
memory: 512Mi
|
||||||
|
volumes:
|
||||||
|
- name: data
|
||||||
|
persistentVolumeClaim:
|
||||||
|
claimName: trek-data
|
||||||
|
- name: uploads
|
||||||
|
persistentVolumeClaim:
|
||||||
|
claimName: trek-uploads
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: trek
|
||||||
|
namespace: trek
|
||||||
|
labels:
|
||||||
|
app: trek
|
||||||
|
app.kubernetes.io/name: trek
|
||||||
|
spec:
|
||||||
|
type: ClusterIP
|
||||||
|
ports:
|
||||||
|
- port: 80
|
||||||
|
targetPort: web
|
||||||
|
name: web
|
||||||
|
selector:
|
||||||
|
app: trek
|
||||||
|
---
|
||||||
|
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: trek
|
||||||
|
namespace: trek
|
||||||
|
labels:
|
||||||
|
app: trek
|
||||||
|
app.kubernetes.io/name: trek
|
||||||
|
annotations:
|
||||||
|
cert-manager.io/cluster-issuer: letsencrypt
|
||||||
|
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
|
||||||
|
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
||||||
|
nginx.ingress.kubernetes.io/client-body-buffer-size: 25m
|
||||||
|
nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
|
||||||
|
nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
|
||||||
|
nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
|
||||||
|
nginx.ingress.kubernetes.io/proxy-next-upstream: "300"
|
||||||
|
nginx.ingress.kubernetes.io/proxy-next-upstream-timeout: "300"
|
||||||
|
spec:
|
||||||
|
ingressClassName: nginx
|
||||||
|
tls:
|
||||||
|
- hosts:
|
||||||
|
- trek.cluster.fun
|
||||||
|
secretName: trek-ingress
|
||||||
|
rules:
|
||||||
|
- host: trek.cluster.fun
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- path: /
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: trek
|
||||||
|
port:
|
||||||
|
name: web
|
||||||
@@ -52,7 +52,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: url-to-grist
|
- name: url-to-grist
|
||||||
image: ghcr.io/namelessplanet/url-to-grist:v1.6.0
|
image: ghcr.io/namelessplanet/url-to-grist:v1.6.1
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: PORT
|
- name: PORT
|
||||||
|
|||||||
Reference in New Issue
Block a user