Merge pull request #127 from carverauto/updates/nginx

sync
carverauto · Feb 11, 2025 · fb5d9c3 · fb5d9c3
2 parents 5bdedf0 + 1ad4e52
commit fb5d9c3
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 126 deletions.
diff --git a/k8s/calico/00-NEW-installation.yaml → k8s/calico/00-installation.yaml b/k8s/calico/00-NEW-installation.yaml → k8s/calico/00-installation.yaml
diff --git a/k8s/calico/04-route-adv.yaml → k8s/calico/01-bgp-configuration.yaml b/k8s/calico/04-route-adv.yaml → k8s/calico/01-bgp-configuration.yaml
@@ -3,9 +3,8 @@ kind: BGPConfiguration
 metadata:
   name: default
 spec:
-  logSeverityScreen: Debug
   asNumber: 65001
-  serviceClusterIPs:
-    - cidr: 10.43.0.0/16
   serviceLoadBalancerIPs:
-    - cidr: "2001:470:c0b5:5::/112"
+    - cidr: 2001:470:c0b5:5::/64
+  serviceClusterIPs:
+    - cidr: 10.43.0.0/16
diff --git a/k8s/calico/05-test-pod.yaml b/k8s/calico/05-test-pod.yaml
diff --git a/k8s/calico/07-ipv6-ippool-NEW.yaml b/k8s/calico/07-ipv6-ippool-NEW.yaml
diff --git a/k8s/calico/08-route-k3s-pool.yaml b/k8s/calico/08-route-k3s-pool.yaml
diff --git a/k8s/calico/tls-test-pod.yaml b/k8s/calico/tls-test-pod.yaml
diff --git a/k8s/frr/README.md b/k8s/frr/README.md
@@ -21,7 +21,8 @@ sysctl net.ipv6.conf.all.forwarding
 ### 2. Static Routes
 Added necessary static routes on the UDM Pro to ensure proper IPv6 routing between subnets:
 ```bash
-ip -6 route add 2001:470:c0b5:2::/64 dev br2
+#ip -6 route add 2001:470:c0b5:5::/64 dev br2
+ip route add 10.43.0.0/16 dev br2
 ```
 
 Note: These static routes will need to be re-added after router reboots unless configured persistently.

diff --git a/k8s/hydra/values.yaml b/k8s/hydra/values.yaml
@@ -30,10 +30,10 @@ hydra:
         port: 4445
     urls:
       self:
-        issuer: https://hydra.tunnel.threadr.ai/
-      login: https://kratos.tunnel.threadr.ai/login
-      consent: https://kratos.tunnel.threadr.ai/consent
-      logout: https://kratos.tunnel.threadr.ai/logout
+        issuer: https://hydra.tunnel.carverauto.dev/
+      login: https://kratos.tunnel.carverauto.dev/login
+      consent: https://kratos.tunnel.carverauto.dev/consent
+      logout: https://kratos.tunnel.carverauto.dev/logout
     strategies:
       access_token: jwt
       jwt:
@@ -163,13 +163,13 @@ ingress:
     enabled: true
     className: "nginx"
     hosts:
-      - host: hydra.tunnel.threadr.ai
+      - host: hydra.tunnel.carverauto.dev
         paths:
           - path: /
             pathType: Prefix
     tls:
       - secretName: auth-services-tls
         hosts:
-          - "*.tunnel.threadr.ai"
+          - "*.tunnel.carverauto.dev"
   admin:
     enabled: false
diff --git a/k8s/metallb/03-k3s-pool-bgp-adv.yaml b/k8s/metallb/03-k3s-pool-bgp-adv.yaml
diff --git a/k8s/metallb/04-bgppeers.yaml b/k8s/metallb/04-bgppeers.yaml
diff --git a/k8s/metallb/metallb-namespace.yaml b/k8s/metallb/metallb-namespace.yaml
diff --git a/k8s/mongodb/base/tcp-services-configmap.yaml b/k8s/mongodb/base/tcp-services-configmap.yaml
@@ -12,10 +12,6 @@ kind: Service
 metadata:
   name: ingress-nginx-controller
   namespace: ingress-nginx
-  annotations:
-    service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "tcp"
-    service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "27017"
-    service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:region:account-id:certificate/certificate-id"  # Replace with your ACM cert ARN
 spec:
   type: LoadBalancer
   ports:

diff --git a/k8s/nginx/nginx-ingress.yaml b/k8s/nginx/nginx-ingress.yaml
@@ -31,12 +31,4 @@ spec:
       metrics:
         enabled: true
       extraArgs:
-        enable-ssl-passthrough: "true"
-
-      dnsPolicy: None
-      dnsConfig:
-        #nameservers:
-        #  - 10.43.0.10 
-        searches:
-          - svc.cluster.local
-          - cluster.local
+        enable-ssl-passthrough: "true"