Compare commits
1 Commits
auto-updat
...
auto-updat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f68b5c6e6 |
@@ -22,34 +22,9 @@ spec:
|
|||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
env:
|
env:
|
||||||
- name: FURUMI_TOKEN
|
- name: FURUMI_TOKEN
|
||||||
valueFrom:
|
value: "f38387266e75effe891b7953eb9c06b4"
|
||||||
secretKeyRef:
|
|
||||||
name: furumi-ng-creds
|
|
||||||
key: TOKEN
|
|
||||||
- name: FURUMI_OIDC_CLIENT_ID
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: furumi-ng-creds
|
|
||||||
key: OIDC_CLIENT_ID
|
|
||||||
- name: FURUMI_OIDC_CLIENT_SECRET
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: furumi-ng-creds
|
|
||||||
key: OIDC_CLIENT_SECRET
|
|
||||||
- name: FURUMI_OIDC_ISSUER_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: furumi-ng-creds
|
|
||||||
key: OIDC_ISSUER_URL
|
|
||||||
- name: FURUMI_OIDC_REDIRECT_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: furumi-ng-creds
|
|
||||||
key: OIDC_REDIRECT_URL
|
|
||||||
- name: FURUMI_ROOT
|
- name: FURUMI_ROOT
|
||||||
value: "/media"
|
value: "/media"
|
||||||
- name: RUST_LOG
|
|
||||||
value: "debug"
|
|
||||||
ports:
|
ports:
|
||||||
- name: grpc
|
- name: grpc
|
||||||
containerPort: 50051
|
containerPort: 50051
|
||||||
@@ -57,9 +32,6 @@ spec:
|
|||||||
- name: metrics
|
- name: metrics
|
||||||
containerPort: 9090
|
containerPort: 9090
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
- name: web-ui
|
|
||||||
containerPort: 8080
|
|
||||||
protocol: TCP
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: music
|
- name: music
|
||||||
mountPath: /media
|
mountPath: /media
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: external-secrets.io/v1
|
|
||||||
kind: ExternalSecret
|
|
||||||
metadata:
|
|
||||||
name: furumi-ng-creds
|
|
||||||
spec:
|
|
||||||
target:
|
|
||||||
name: furumi-ng-creds
|
|
||||||
deletionPolicy: Delete
|
|
||||||
template:
|
|
||||||
type: Opaque
|
|
||||||
data:
|
|
||||||
TOKEN: |-
|
|
||||||
{{ .token }}
|
|
||||||
OIDC_CLIENT_ID: |-
|
|
||||||
{{ .client_id }}
|
|
||||||
OIDC_CLIENT_SECRET: |-
|
|
||||||
{{ .client_secret }}
|
|
||||||
OIDC_ISSUER_URL: https://idm.hexor.cy/application/o/furumi-ng-web/
|
|
||||||
OIDC_REDIRECT_URL: https://music.hexor.cy/auth/callback
|
|
||||||
data:
|
|
||||||
- secretKey: token
|
|
||||||
sourceRef:
|
|
||||||
storeRef:
|
|
||||||
name: vaultwarden-login
|
|
||||||
kind: ClusterSecretStore
|
|
||||||
remoteRef:
|
|
||||||
key: b8b8c3a2-c3fe-42d3-9402-0ae305e1455f
|
|
||||||
property: fields[0].value
|
|
||||||
- secretKey: client_id
|
|
||||||
sourceRef:
|
|
||||||
storeRef:
|
|
||||||
name: vaultwarden-login
|
|
||||||
kind: ClusterSecretStore
|
|
||||||
remoteRef:
|
|
||||||
key: b8b8c3a2-c3fe-42d3-9402-0ae305e1455f
|
|
||||||
property: fields[1].value
|
|
||||||
- secretKey: client_secret
|
|
||||||
sourceRef:
|
|
||||||
storeRef:
|
|
||||||
name: vaultwarden-login
|
|
||||||
kind: ClusterSecretStore
|
|
||||||
remoteRef:
|
|
||||||
key: b8b8c3a2-c3fe-42d3-9402-0ae305e1455f
|
|
||||||
property: fields[2].value
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: networking.k8s.io/v1
|
|
||||||
kind: Ingress
|
|
||||||
metadata:
|
|
||||||
name: furumi-tls-ingress
|
|
||||||
annotations:
|
|
||||||
ingressClassName: traefik
|
|
||||||
cert-manager.io/cluster-issuer: letsencrypt
|
|
||||||
traefik.ingress.kubernetes.io/router.middlewares: kube-system-https-redirect@kubernetescrd
|
|
||||||
acme.cert-manager.io/http01-edit-in-place: "true"
|
|
||||||
spec:
|
|
||||||
rules:
|
|
||||||
- host: music.hexor.cy
|
|
||||||
http:
|
|
||||||
paths:
|
|
||||||
- path: /
|
|
||||||
pathType: Prefix
|
|
||||||
backend:
|
|
||||||
service:
|
|
||||||
name: furumi-server-web
|
|
||||||
port:
|
|
||||||
number: 8080
|
|
||||||
tls:
|
|
||||||
- secretName: furumi-tls
|
|
||||||
hosts:
|
|
||||||
- '*.hexor.cy'
|
|
||||||
|
|
||||||
|
|
||||||
@@ -6,5 +6,3 @@ resources:
|
|||||||
- deployment.yaml
|
- deployment.yaml
|
||||||
- service.yaml
|
- service.yaml
|
||||||
- servicemonitor.yaml
|
- servicemonitor.yaml
|
||||||
- external-secrets.yaml
|
|
||||||
- ingress.yaml
|
|
||||||
|
|||||||
@@ -28,19 +28,3 @@ spec:
|
|||||||
protocol: TCP
|
protocol: TCP
|
||||||
port: 9090
|
port: 9090
|
||||||
targetPort: 9090
|
targetPort: 9090
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: furumi-server-web
|
|
||||||
labels:
|
|
||||||
app: furumi-server
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
selector:
|
|
||||||
app: furumi-server
|
|
||||||
ports:
|
|
||||||
- name: web-ui
|
|
||||||
protocol: TCP
|
|
||||||
port: 8080
|
|
||||||
targetPort: 8080
|
|
||||||
|
|||||||
@@ -52,17 +52,16 @@ spec:
|
|||||||
mas-oidc.yaml: |
|
mas-oidc.yaml: |
|
||||||
upstream_oauth2:
|
upstream_oauth2:
|
||||||
providers:
|
providers:
|
||||||
- id: 001KKV4EKY7KG98W2M9T806K6A
|
- id: authentik
|
||||||
human_name: Authentik
|
human_name: Authentik
|
||||||
issuer: https://idm.hexor.cy/application/o/matrix/
|
issuer: https://idm.hexor.cy/application/o/matrix/
|
||||||
client_id: "{{ .oauth_client_id }}"
|
client_id: {{ .oauth_client_id }}
|
||||||
client_secret: "{{ .oauth_client_secret }}"
|
client_secret: {{ .oauth_client_secret }}
|
||||||
token_endpoint_auth_method: client_secret_post
|
|
||||||
scope: "openid profile email"
|
scope: "openid profile email"
|
||||||
claims_imports:
|
claims_imports:
|
||||||
localpart:
|
localpart:
|
||||||
action: suggest
|
action: require
|
||||||
template: "{{ `{{ user.preferred_username | split(\"@\") | first }}` }}"
|
template: "{{ `{{ user.preferred_username }}` }}"
|
||||||
displayname:
|
displayname:
|
||||||
action: suggest
|
action: suggest
|
||||||
template: "{{ `{{ user.name }}` }}"
|
template: "{{ `{{ user.name }}` }}"
|
||||||
|
|||||||
@@ -16,37 +16,14 @@ postgres:
|
|||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
## Disable components we don't need yet
|
## Disable components we don't need yet
|
||||||
|
matrixRTC:
|
||||||
|
enabled: false
|
||||||
hookshot:
|
hookshot:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|
||||||
## MatrixRTC - voice/video calls via LiveKit SFU
|
|
||||||
matrixRTC:
|
|
||||||
enabled: true
|
|
||||||
ingress:
|
|
||||||
host: livekit.matrix.hexor.cy
|
|
||||||
sfu:
|
|
||||||
enabled: true
|
|
||||||
manualIP: "138.201.61.182"
|
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/hostname: master.tail2fe2d.ts.net
|
|
||||||
exposedServices:
|
|
||||||
rtcTcp:
|
|
||||||
enabled: true
|
|
||||||
port: 30881
|
|
||||||
rtcMuxedUdp:
|
|
||||||
enabled: true
|
|
||||||
port: 30882
|
|
||||||
turnTLS:
|
|
||||||
enabled: true
|
|
||||||
port: 31443
|
|
||||||
domain: turn.matrix.hexor.cy
|
|
||||||
tlsTerminationOnPod: true
|
|
||||||
|
|
||||||
## Synapse homeserver
|
## Synapse homeserver
|
||||||
synapse:
|
synapse:
|
||||||
enabled: true
|
enabled: true
|
||||||
ingress:
|
|
||||||
host: synapse.matrix.hexor.cy
|
|
||||||
postgres:
|
postgres:
|
||||||
host: psql.psql.svc
|
host: psql.psql.svc
|
||||||
port: 5432
|
port: 5432
|
||||||
@@ -66,8 +43,6 @@ synapse:
|
|||||||
## Matrix Authentication Service
|
## Matrix Authentication Service
|
||||||
matrixAuthenticationService:
|
matrixAuthenticationService:
|
||||||
enabled: true
|
enabled: true
|
||||||
ingress:
|
|
||||||
host: auth.matrix.hexor.cy
|
|
||||||
postgres:
|
postgres:
|
||||||
host: psql.psql.svc
|
host: psql.psql.svc
|
||||||
port: 5432
|
port: 5432
|
||||||
@@ -77,15 +52,9 @@ matrixAuthenticationService:
|
|||||||
password:
|
password:
|
||||||
secret: matrix-postgres-creds
|
secret: matrix-postgres-creds
|
||||||
secretKey: mas_db_password
|
secretKey: mas_db_password
|
||||||
## Admin policy
|
## Authentik OIDC upstream provider
|
||||||
additional:
|
additional:
|
||||||
0-admin-policy:
|
0-oidc:
|
||||||
config: |
|
|
||||||
policy:
|
|
||||||
data:
|
|
||||||
admin_users:
|
|
||||||
- username: ultradesu
|
|
||||||
1-oidc:
|
|
||||||
configSecret: matrix-oidc-config
|
configSecret: matrix-oidc-config
|
||||||
configSecretKey: mas-oidc.yaml
|
configSecretKey: mas-oidc.yaml
|
||||||
# nodeSelector:
|
# nodeSelector:
|
||||||
@@ -95,7 +64,7 @@ matrixAuthenticationService:
|
|||||||
elementWeb:
|
elementWeb:
|
||||||
enabled: true
|
enabled: true
|
||||||
ingress:
|
ingress:
|
||||||
host: chat.matrix.hexor.cy
|
host: chat.hexor.cy
|
||||||
# nodeSelector:
|
# nodeSelector:
|
||||||
# kubernetes.io/hostname: nas.homenet
|
# kubernetes.io/hostname: nas.homenet
|
||||||
|
|
||||||
@@ -103,7 +72,7 @@ elementWeb:
|
|||||||
elementAdmin:
|
elementAdmin:
|
||||||
enabled: true
|
enabled: true
|
||||||
ingress:
|
ingress:
|
||||||
host: admin.matrix.hexor.cy
|
host: matrix-admin.hexor.cy
|
||||||
# nodeSelector:
|
# nodeSelector:
|
||||||
# kubernetes.io/hostname: nas.homenet
|
# kubernetes.io/hostname: nas.homenet
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ kind: Kustomization
|
|||||||
resources:
|
resources:
|
||||||
- external-secrets.yaml
|
- external-secrets.yaml
|
||||||
- local-pv.yaml
|
- local-pv.yaml
|
||||||
- open-terminal.yaml
|
|
||||||
|
|
||||||
helmCharts:
|
helmCharts:
|
||||||
- name: ollama
|
- name: ollama
|
||||||
@@ -16,7 +15,7 @@ helmCharts:
|
|||||||
includeCRDs: true
|
includeCRDs: true
|
||||||
- name: open-webui
|
- name: open-webui
|
||||||
repo: https://helm.openwebui.com/
|
repo: https://helm.openwebui.com/
|
||||||
version: 12.10.0
|
version: 12.8.1
|
||||||
releaseName: openweb-ui
|
releaseName: openweb-ui
|
||||||
namespace: ollama
|
namespace: ollama
|
||||||
valuesFile: openweb-ui-values.yaml
|
valuesFile: openweb-ui-values.yaml
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: open-terminal
|
|
||||||
labels:
|
|
||||||
app: open-terminal
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: open-terminal
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: open-terminal
|
|
||||||
spec:
|
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/hostname: uk-desktop.tail2fe2d.ts.net
|
|
||||||
tolerations:
|
|
||||||
- key: workload
|
|
||||||
operator: Equal
|
|
||||||
value: desktop
|
|
||||||
effect: NoSchedule
|
|
||||||
containers:
|
|
||||||
- name: open-terminal
|
|
||||||
image: ghcr.io/open-webui/open-terminal:latest
|
|
||||||
ports:
|
|
||||||
- containerPort: 8000
|
|
||||||
env:
|
|
||||||
- name: OPEN_TERMINAL_API_KEY
|
|
||||||
value: "LOCAL_ACCESS_TOKEN"
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 256Mi
|
|
||||||
limits:
|
|
||||||
cpu: "2"
|
|
||||||
memory: 2Gi
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: open-terminal
|
|
||||||
labels:
|
|
||||||
app: open-terminal
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: open-terminal
|
|
||||||
ports:
|
|
||||||
- port: 8000
|
|
||||||
targetPort: 8000
|
|
||||||
protocol: TCP
|
|
||||||
@@ -54,6 +54,19 @@ server:
|
|||||||
traefik.ingress.kubernetes.io/router.middlewares: kube-system-https-redirect@kubernetescrd
|
traefik.ingress.kubernetes.io/router.middlewares: kube-system-https-redirect@kubernetescrd
|
||||||
hosts:
|
hosts:
|
||||||
- idm.hexor.cy
|
- idm.hexor.cy
|
||||||
|
- nas.hexor.cy # TrueNAS Limassol
|
||||||
|
- nc.hexor.cy # NaxtCloud
|
||||||
|
- of.hexor.cy # Outfleet-v2
|
||||||
|
- k8s.hexor.cy # k8s dashboard
|
||||||
|
- qbt.hexor.cy # qBittorent for Jellyfin
|
||||||
|
- prom.hexor.cy # Prometheus
|
||||||
|
- khm.hexor.cy # Known Hosts keys Manager
|
||||||
|
- backup.hexor.cy # Kopia Backup UI
|
||||||
|
- fm.hexor.cy # Filemanager
|
||||||
|
- minecraft.hexor.cy # Minecraft UI and server
|
||||||
|
- pass.hexor.cy # k8s-secret for openai
|
||||||
|
- ps.hexor.cy # pasarguard UI
|
||||||
|
# - rw.hexor.cy # RemnaWave UI
|
||||||
tls:
|
tls:
|
||||||
- secretName: idm-tls
|
- secretName: idm-tls
|
||||||
hosts:
|
hosts:
|
||||||
|
|||||||
@@ -37,5 +37,4 @@ spec:
|
|||||||
dnsZones:
|
dnsZones:
|
||||||
- "ps.hexor.cy"
|
- "ps.hexor.cy"
|
||||||
- "of.hexor.cy"
|
- "of.hexor.cy"
|
||||||
- "matrix.hexor.cy"
|
|
||||||
|
|
||||||
|
|||||||
@@ -195,9 +195,9 @@ oauth_applications = {
|
|||||||
meta_description = "Matrix Chat"
|
meta_description = "Matrix Chat"
|
||||||
meta_icon = "https://img.icons8.com/ios/100/40C057/matrix-logo.png"
|
meta_icon = "https://img.icons8.com/ios/100/40C057/matrix-logo.png"
|
||||||
redirect_uris = [
|
redirect_uris = [
|
||||||
"https://auth.matrix.hexor.cy/upstream/callback/001KKV4EKY7KG98W2M9T806K6A",
|
"https://matrix.hexor.cy/_matrix/client/unstable/org.matrix.msc2965/auth/upstream/callback",
|
||||||
]
|
]
|
||||||
meta_launch_url = "https://chat.matrix.hexor.cy"
|
meta_launch_url = "https://matrix.hexor.cy"
|
||||||
client_type = "confidential"
|
client_type = "confidential"
|
||||||
include_claims_in_id_token = true
|
include_claims_in_id_token = true
|
||||||
access_code_validity = "minutes=1"
|
access_code_validity = "minutes=1"
|
||||||
@@ -205,27 +205,7 @@ oauth_applications = {
|
|||||||
refresh_token_validity = "days=30"
|
refresh_token_validity = "days=30"
|
||||||
scope_mappings = ["openid", "profile", "email"]
|
scope_mappings = ["openid", "profile", "email"]
|
||||||
access_groups = []
|
access_groups = []
|
||||||
create_group = false
|
create_group = true
|
||||||
signing_key = "1b1b5bec-034a-4d96-871a-133f11322360"
|
|
||||||
}
|
|
||||||
"furumi-ng-web" = {
|
|
||||||
name = "Furumi Web Player"
|
|
||||||
slug = "furumi-ng-web"
|
|
||||||
group = "Tools"
|
|
||||||
meta_description = "Furumi Web Player"
|
|
||||||
meta_icon = "https://img.icons8.com/pulsar-color/48/music.png"
|
|
||||||
redirect_uris = [
|
|
||||||
"https://music.hexor.cy/auth/callback",
|
|
||||||
]
|
|
||||||
meta_launch_url = "https://music.hexor.cy"
|
|
||||||
client_type = "confidential"
|
|
||||||
include_claims_in_id_token = true
|
|
||||||
access_code_validity = "minutes=1"
|
|
||||||
access_token_validity = "minutes=5"
|
|
||||||
refresh_token_validity = "days=30"
|
|
||||||
scope_mappings = ["openid", "profile", "email"]
|
|
||||||
access_groups = []
|
|
||||||
create_group = false
|
|
||||||
signing_key = "1b1b5bec-034a-4d96-871a-133f11322360"
|
signing_key = "1b1b5bec-034a-4d96-871a-133f11322360"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user