fix(reactive-resume): ingress & netpols

JJGadgets · Feb 28, 2024 · 803790b · 803790b
1 parent ff48555
commit 803790b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 29 deletions.
diff --git a/kube/deploy/apps/reactive-resume/app/hr.yaml b/kube/deploy/apps/reactive-resume/app/hr.yaml
@@ -27,6 +27,7 @@ spec:
             tailscale.com/expose: "true"
             db.home.arpa/pg: "pg-home"
             s3.home.arpa/store: "rgw-${CLUSTER_NAME}"
+            ingress.home.arpa/jjgadgets: "allow"
         containers:
           main:
             image:
@@ -116,36 +117,41 @@ spec:
             port: 3000
     ingress:
       main:
-        enabled: false
-        # primary: true
-        # className: "nginx-internal"
-        # annotations:
-        #   nginx.ingress.kubernetes.io/use-regex: "true"
-        #   nginx.ingress.kubernetes.io/rewrite-target: "/$2"
-        # hosts:
-        #   - host: &host "${APP_DNS_REACTIVE_RESUME}"
-        #     paths:
-        #       - path: "/api(/|$)(.*)"
-        #         pathType: ImplementationSpecific
-        #         service:
-        #           name: main
-        #           port: http
-        # tls:
-        #   - hosts: [*host]
+        enabled: true
+        primary: true
+        className: "nginx-internal"
+        annotations:
+          nginx.ingress.kubernetes.io/use-regex: "true"
+          nginx.ingress.kubernetes.io/rewrite-target: "/$2"
+          nginx.ingress.kubernetes.io/whitelist-source-range: |
+            ${IP_JJ_V4}
+        hosts:
+          - host: &host "${APP_DNS_REACTIVE_RESUME}"
+            paths:
+              - path: "/api(/|$)(.*)"
+                pathType: ImplementationSpecific
+                service:
+                  name: main
+                  port: http
+        tls:
+          - hosts: [*host]
       backend:
-        enabled: false
-        # primary: false
-        # className: "nginx-internal"
-        # hosts:
-        #   - host: *host
-        #     paths:
-        #       - path: /
-        #         pathType: Prefix
-        #         service:
-        #           name: main
-        #           port: frontend
-        # tls:
-        #   - hosts: [*host]
+        enabled: true
+        primary: false
+        className: "nginx-internal"
+        annotations:
+          nginx.ingress.kubernetes.io/whitelist-source-range: |
+            ${IP_JJ_V4}
+        hosts:
+          - host: *host
+            paths:
+              - path: /
+                pathType: Prefix
+                service:
+                  name: main
+                  port: frontend
+        tls:
+          - hosts: [*host]
     persistence:
       config:
         enabled: false

diff --git a/kube/deploy/core/_networking/cilium/netpols/labelled-allow-ingress.yaml b/kube/deploy/core/_networking/cilium/netpols/labelled-allow-ingress.yaml
@@ -97,6 +97,19 @@ spec:
 # yaml-language-server: $schema=https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/cilium.io/ciliumclusterwidenetworkpolicy_v2.json
 apiVersion: cilium.io/v2
 kind: CiliumClusterwideNetworkPolicy
+metadata:
+  name: labelled-allow-ingress-jjgadgets
+spec:
+  endpointSelector:
+    matchLabels:
+      ingress.home.arpa/jjgadgets: "allow"
+  ingress:
+    - fromCIDRSet:
+        - cidr: "${IP_JJ_V4}"
+---
+# yaml-language-server: $schema=https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/cilium.io/ciliumclusterwidenetworkpolicy_v2.json
+apiVersion: cilium.io/v2
+kind: CiliumClusterwideNetworkPolicy
 metadata:
   name: labelled-allow-ingress-wg-guest
 spec: