ingress updates

ThomasCardin · Nov 18, 2024 · 2d6cbfc · 2d6cbfc
1 parent d6ecb4d
commit 2d6cbfc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/kubernetes/apps/ollama/base/ingress.yaml b/kubernetes/apps/ollama/base/ingress.yaml
@@ -8,8 +8,8 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "500"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "500"
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    external-dns.alpha.kubernetes.io/hostname: ninebasetwo.net
-    external-dns.alpha.kubernetes.io/target: ollama.ninebasetwo.net
+    nginx.ingress.kubernetes.io/auth-url: "https://oauth2.ninebasetwo.net/oauth2/auth"
+    nginx.ingress.kubernetes.io/auth-signin: "https://oauth2.ninebasetwo.net/oauth2/start?rd=$scheme://$host$request_uri"
 spec:
   ingressClassName: nginx 
   rules:

diff --git a/kubernetes/apps/trilium-notes/base/ingress.yaml b/kubernetes/apps/trilium-notes/base/ingress.yaml
@@ -6,8 +6,6 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    external-dns.alpha.kubernetes.io/hostname: ninebasetwo.net
-    external-dns.alpha.kubernetes.io/target: trilium.ninebasetwo.net
     nginx.ingress.kubernetes.io/auth-url: "https://oauth2.ninebasetwo.net/oauth2/auth"
     nginx.ingress.kubernetes.io/auth-signin: "https://oauth2.ninebasetwo.net/oauth2/start?rd=$scheme://$host$request_uri"
 spec:

diff --git a/kubernetes/system/argocd/base/ingress.yaml b/kubernetes/system/argocd/base/ingress.yaml
@@ -6,8 +6,8 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    external-dns.alpha.kubernetes.io/hostname: ninebasetwo.net
-    external-dns.alpha.kubernetes.io/target: argocd.ninebasetwo.net
+    nginx.ingress.kubernetes.io/auth-url: "https://oauth2.ninebasetwo.net/oauth2/auth"
+    nginx.ingress.kubernetes.io/auth-signin: "https://oauth2.ninebasetwo.net/oauth2/start?rd=$scheme://$host$request_uri"
 spec:
   ingressClassName: nginx 
   rules:

diff --git a/kubernetes/system/monitoring/base/ingress.yaml b/kubernetes/system/monitoring/base/ingress.yaml
@@ -8,9 +8,6 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     nginx.ingress.kubernetes.io/auth-url: "https://oauth2.ninebasetwo.net/oauth2/auth"
     nginx.ingress.kubernetes.io/auth-signin: "https://oauth2.ninebasetwo.net/oauth2/start?rd=$scheme://$host$request_uri"
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-      auth_request_set $token $upstream_http_x_auth_request_access_token;
-      proxy_set_header X-Access-Token $token;
 spec:
   ingressClassName: nginx 
   rules:

diff --git a/kubernetes/system/rook-ceph/base/ingress.yaml b/kubernetes/system/rook-ceph/base/ingress.yaml
@@ -8,6 +8,8 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     external-dns.alpha.kubernetes.io/hostname: ninebasetwo.net
     external-dns.alpha.kubernetes.io/target: ceph.ninebasetwo.net
+    nginx.ingress.kubernetes.io/auth-url: "https://oauth2.ninebasetwo.net/oauth2/auth"
+    nginx.ingress.kubernetes.io/auth-signin: "https://oauth2.ninebasetwo.net/oauth2/start?rd=$scheme://$host$request_uri"
 spec:
   ingressClassName: nginx 
   rules: