Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f7c279a67a | |||
| 09e43ded52 | |||
| 7d766d1cf9 | |||
| 2b17fe67e5 | |||
| 2b26f21649 |
@@ -22,7 +22,7 @@ spec:
|
|||||||
entryPoints:
|
entryPoints:
|
||||||
- websecure
|
- websecure
|
||||||
routes:
|
routes:
|
||||||
- match: Host(`secret-reader.hexor.cy`)
|
- match: Host(`proxy.hexor.cy`)
|
||||||
kind: Rule
|
kind: Rule
|
||||||
middlewares:
|
middlewares:
|
||||||
- name: auth-proxy
|
- name: auth-proxy
|
||||||
@@ -30,16 +30,16 @@ spec:
|
|||||||
- name: secret-reader
|
- name: secret-reader
|
||||||
port: 80
|
port: 80
|
||||||
tls:
|
tls:
|
||||||
secretName: secret-reader-tls
|
secretName: proxy-tls
|
||||||
---
|
---
|
||||||
apiVersion: cert-manager.io/v1
|
apiVersion: cert-manager.io/v1
|
||||||
kind: Certificate
|
kind: Certificate
|
||||||
metadata:
|
metadata:
|
||||||
name: secret-reader-tls
|
name: proxy-tls
|
||||||
spec:
|
spec:
|
||||||
secretName: secret-reader-tls
|
secretName: proxy-tls
|
||||||
issuerRef:
|
issuerRef:
|
||||||
name: letsencrypt
|
name: letsencrypt
|
||||||
kind: ClusterIssuer
|
kind: ClusterIssuer
|
||||||
dnsNames:
|
dnsNames:
|
||||||
- secret-reader.hexor.cy
|
- proxy.hexor.cy
|
||||||
|
|||||||
@@ -9,18 +9,18 @@ resources:
|
|||||||
helmCharts:
|
helmCharts:
|
||||||
- name: ollama
|
- name: ollama
|
||||||
repo: https://otwld.github.io/ollama-helm/
|
repo: https://otwld.github.io/ollama-helm/
|
||||||
version: 1.49.0
|
version: 1.58.0
|
||||||
releaseName: ollama
|
releaseName: ollama
|
||||||
namespace: ollama
|
namespace: ollama
|
||||||
valuesFile: ollama-values.yaml
|
valuesFile: ollama-values.yaml
|
||||||
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: 14.8.0
|
||||||
releaseName: openweb-ui
|
releaseName: openweb-ui
|
||||||
namespace: ollama
|
namespace: ollama
|
||||||
valuesFile: openweb-ui-values.yaml
|
valuesFile: openweb-ui-values.yaml
|
||||||
includeCRDs: true
|
includeCRDs: true
|
||||||
|
|
||||||
patches:
|
patches:
|
||||||
- path: patch-runtimeclass.yaml
|
- path: patch-runtimeclass.yaml
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ clusterDomain: cluster.local
|
|||||||
|
|
||||||
extraEnvVars:
|
extraEnvVars:
|
||||||
GLOBAL_LOG_LEVEL: debug
|
GLOBAL_LOG_LEVEL: debug
|
||||||
OAUTH_PROVIDER_NAME: authentik
|
OAUTH_PROVIDER_NAME: keycloak
|
||||||
OPENID_PROVIDER_URL: https://idm.hexor.cy/application/o/openwebui/.well-known/openid-configuration
|
OPENID_PROVIDER_URL: https://auth.hexor.cy/auth/realms/hexor/.well-known/openid-configuration
|
||||||
OPENID_REDIRECT_URI: https://ai.hexor.cy/oauth/oidc/callback
|
OPENID_REDIRECT_URI: https://ai.hexor.cy/oauth/oidc/callback
|
||||||
WEBUI_URL: https://ai.hexor.cy
|
WEBUI_URL: https://ai.hexor.cy
|
||||||
# Allows auto-creation of new users using OAuth. Must be paired with ENABLE_LOGIN_FORM=false.
|
# Allows auto-creation of new users using OAuth. Must be paired with ENABLE_LOGIN_FORM=false.
|
||||||
@@ -31,7 +31,7 @@ ollama:
|
|||||||
- qwen3-vl:8b
|
- qwen3-vl:8b
|
||||||
|
|
||||||
pipelines:
|
pipelines:
|
||||||
enabled: true
|
enabled: false
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/hostname: master.tail2fe2d.ts.net
|
kubernetes.io/hostname: master.tail2fe2d.ts.net
|
||||||
|
|
||||||
@@ -57,4 +57,4 @@ ingress:
|
|||||||
traefik.ingress.kubernetes.io/router.middlewares: kube-system-https-redirect@kubernetescrd
|
traefik.ingress.kubernetes.io/router.middlewares: kube-system-https-redirect@kubernetescrd
|
||||||
host: "ai.hexor.cy"
|
host: "ai.hexor.cy"
|
||||||
tls: true
|
tls: true
|
||||||
existingSecret: ollama-tls
|
existingSecret: ollama-tls
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ groups = [
|
|||||||
|
|
||||||
proxy_applications = {
|
proxy_applications = {
|
||||||
secret-reader = {
|
secret-reader = {
|
||||||
domain = "secret-reader.hexor.cy"
|
domain = "proxy.hexor.cy"
|
||||||
allowed_groups = ["hexor-guest", "hexor-admin"]
|
allowed_groups = ["hexor-admin", "app-pass"]
|
||||||
}
|
}
|
||||||
pass = {
|
pass = {
|
||||||
domain = "pass.hexor.cy"
|
domain = "pass.hexor.cy"
|
||||||
allowed_groups = ["hexor-guest", "hexor-admin"]
|
allowed_groups = ["hexor-admin", "app-pass"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,6 +40,11 @@ oauth2_applications = {
|
|||||||
web_origins = ["https://gf.hexor.cy"]
|
web_origins = ["https://gf.hexor.cy"]
|
||||||
post_logout_redirect_uris = ["https://gf.hexor.cy/*"]
|
post_logout_redirect_uris = ["https://gf.hexor.cy/*"]
|
||||||
}
|
}
|
||||||
|
openwebui = {
|
||||||
|
redirect_uris = ["https://ai.hexor.cy/oauth/oidc/callback"]
|
||||||
|
web_origins = ["https://ai.hexor.cy"]
|
||||||
|
post_logout_redirect_uris = ["https://ai.hexor.cy/*"]
|
||||||
|
}
|
||||||
FuruMusic = {
|
FuruMusic = {
|
||||||
redirect_uris = ["https://music.hexor.cy/auth/oidc/callback"]
|
redirect_uris = ["https://music.hexor.cy/auth/oidc/callback"]
|
||||||
web_origins = ["https://music.hexor.cy"]
|
web_origins = ["https://music.hexor.cy"]
|
||||||
@@ -56,4 +61,3 @@ oauth2_applications = {
|
|||||||
post_logout_redirect_uris = ["https://pet.hexor.cy/*", "https://xn--l1acako8eb.xn--p1ai/*", "https://мурняня.рф/*"]
|
post_logout_redirect_uris = ["https://pet.hexor.cy/*", "https://xn--l1acako8eb.xn--p1ai/*", "https://мурняня.рф/*"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user