Merge pull request #149 from 3dwardch3ng/misc

consolidate cluster ingress

kubernetes/apps/capacitor/capacitor.yaml

@@ -25,26 +25,3 @@ spec:
           value: Flux
         - op: remove
           path: "/metadata/labels/helm.sh~1chart"
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: capacitor-ingress
-  namespace: flux-system
-  annotations:
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/use-regex: "true"
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: "capacitor.edward.sydney"
-      http:
-        paths:
-          - pathType: Prefix
-            path: "/"
-            backend:
-              service:
-                name: capacitor
-                port:
-                  number: 9100

kubernetes/infrastructure/ingress-nginx/ingress.yaml

@@ -0,0 +1,32 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: cluster-ingress
+  namespace: flux-system
+  annotations:
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: "capacitor.edward.sydney"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: capacitor
+                port:
+                  number: 9100
+    - host: "capacitor.local"
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: capacitor
+                port:
+                  number: 9100

kubernetes/infrastructure/ingress-nginx/kustomization.yaml

@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ingress-nginx.yaml
-  - ingress-nginx-config.yaml
+  - ingress-nginx-config.yaml
+  - ingress.yaml

kubernetes/infrastructure/kustomization.yaml

@@ -5,3 +5,4 @@ resources:
   - ./cilium/cilium.yaml
   - ./ingress-nginx/ingress-nginx-config.yaml
   - ./ingress-nginx/ingress-nginx.yaml
+  - ./ingress-nginx/ingress.yaml