feat: switch from route to ingress (#40)

ArthurVardevanyan · Feb 3, 2024 · 4a13574 · 4a13574
1 parent b3d6214
commit 4a13574
Show file tree

Hide file tree

Showing 25 changed files with 352 additions and 285 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -323,6 +323,7 @@
     "mkpasswd",
     "moreutils",
     "mountsatoken",
+    "mtls",
     "multiband",
     "mutatingwebhookconfigurations",
     "myminio",

diff --git a/kubernetes/gitea/overlays/okd/route.yaml b/kubernetes/gitea/overlays/okd/route.yaml
@@ -1,20 +1,22 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: gitea
   namespace: gitea
   labels:
-    app: gitea
     app.kubernetes.io/instance: gitea
+  annotations:
+    route.openshift.io/termination: passthrough
 spec:
-  host: "git.arthurvardevanyan.com"
-  to:
-    kind: Service
-    name: gitea-http
-    weight: 100
-  port:
-    targetPort: http
-  tls:
-    termination: passthrough
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: git.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: gitea-http
+                port:
+                  name: http
diff --git a/kubernetes/grafana/overlays/okd/route.yaml b/kubernetes/grafana/overlays/okd/route.yaml
@@ -1,20 +1,22 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: grafana
   namespace: grafana
   labels:
-    app: grafana
-    app.kubernetes.io/instance: grafana
+    app.kubernetes.io/instance: gitea
+  annotations:
+    route.openshift.io/termination: edge
 spec:
-  host: grafana.apps.okd.<path:secret/data/homelab/domain#url>
-  to:
-    kind: Service
-    name: grafana
-    weight: 100
-  port:
-    targetPort: 3000
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: grafana.apps.okd.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: grafana
+                port:
+                  name: http
diff --git a/kubernetes/heimdall/overlays/okd/route.yaml b/kubernetes/heimdall/overlays/okd/route.yaml
@@ -1,20 +1,22 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: heimdall
   namespace: heimdall
   labels:
-    app: heimdall
     app.kubernetes.io/instance: heimdall
+  annotations:
+    route.openshift.io/termination: edge
 spec:
-  host: heimdall.apps.okd.<path:secret/data/homelab/domain#url>
-  to:
-    kind: Service
-    name: heimdall
-    weight: 100
-  port:
-    targetPort: 80
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: heimdall.apps.okd.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: heimdall
+                port:
+                  name: http-80
diff --git a/kubernetes/homeassistant/base/service.yaml b/kubernetes/homeassistant/base/service.yaml
@@ -12,5 +12,6 @@ spec:
     - protocol: TCP
       port: 8123
       targetPort: 8123
+      name: https
   type: ClusterIP
   clusterIP: None
diff --git a/kubernetes/homeassistant/overlays/okd/route.yaml b/kubernetes/homeassistant/overlays/okd/route.yaml
@@ -1,20 +1,22 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: homeassistant
   namespace: homeassistant
   labels:
-    app: homeassistant
     app.kubernetes.io/instance: homeassistant
+  annotations:
+    route.openshift.io/termination: passthrough
 spec:
-  host: "home.<path:secret/data/homelab/domain#url>"
-  to:
-    kind: Service
-    name: homeassistant
-    weight: 100
-  port:
-    targetPort: 8123
-  tls:
-    termination: passthrough
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: home.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: homeassistant
+                port:
+                  name: https
diff --git a/kubernetes/influxdb/base/service.yaml b/kubernetes/influxdb/base/service.yaml
@@ -13,7 +13,7 @@ spec:
     - name: "2003"
       port: 2003
       targetPort: 2003
-    - name: "8086"
+    - name: http
       port: 8086
       targetPort: 8086
   selector:

diff --git a/kubernetes/influxdb/overlays/okd/route.yaml b/kubernetes/influxdb/overlays/okd/route.yaml
@@ -1,20 +1,22 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: influxdb
   namespace: influxdb
   labels:
-    app: influxdb
     app.kubernetes.io/instance: influxdb
+  annotations:
+    route.openshift.io/termination: edge
 spec:
-  host: influxdb.apps.okd.<path:secret/data/homelab/domain#url>
-  to:
-    kind: Service
-    name: influxdb
-    weight: 100
-  port:
-    targetPort: 8086
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: influxdb.apps.okd.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: influxdb
+                port:
+                  name: http
diff --git a/kubernetes/loki/base/route.yaml b/kubernetes/loki/base/route.yaml
@@ -1,20 +1,22 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: loki
   namespace: loki
   labels:
-    app: loki
     app.kubernetes.io/instance: loki
+  annotations:
+    route.openshift.io/termination: edge
 spec:
-  host: loki.apps.okd.<path:secret/data/homelab/domain#url>
-  to:
-    kind: Service
-    name: loki
-    weight: 100
-  port:
-    targetPort: http-metrics
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: loki.apps.okd.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: loki
+                port:
+                  name: http-metrics
diff --git a/kubernetes/longhorn/components/okd/route.yaml b/kubernetes/longhorn/components/okd/route.yaml
@@ -1,5 +1,5 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: longhorn-ui
   namespace: longhorn-system
@@ -8,12 +8,18 @@ metadata:
     app.kubernetes.io/instance: longhorn
     app.kubernetes.io/version: v1.5.3
     app: longhorn-ui
+  annotations:
+    route.openshift.io/termination: reencrypt
 spec:
-  host: ""
-  to:
-    kind: Service
-    name: longhorn-ui
-  tls:
-    termination: reencrypt
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: ""
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: longhorn-ui
+                port:
+                  name: longhorn-ui
diff --git a/kubernetes/longhorn/overlays/okd-sandbox/kustomization.yaml b/kubernetes/longhorn/overlays/okd-sandbox/kustomization.yaml
@@ -6,9 +6,9 @@ components:
   - ../../components/okd
 patches:
   - target:
-      kind: Route
-      name: ui
+      kind: Ingress
+      name: longhorn-ui
     patch: |-
       - op: replace
-        path: /spec/host
-        value: longhorn.apps.okd.sandbox.<path:secret/data/homelab/domain#url>
+        path: /spec/rules/0/host
+        value: longhorn.apps.okd.sandbox.arthurvardevanyan.com
diff --git a/kubernetes/longhorn/overlays/okd/kustomization.yaml b/kubernetes/longhorn/overlays/okd/kustomization.yaml
@@ -8,9 +8,9 @@ components:
   - ../../components/okd
 patches:
   - target:
-      kind: Route
+      kind: Ingress
       name: longhorn-ui
     patch: |-
       - op: replace
-        path: /spec/host
-        value: longhorn.apps.okd.<path:secret/data/homelab/domain#url>
+        path: /spec/rules/0/host
+        value: longhorn.apps.okd.arthurvardevanyan.com
diff --git a/kubernetes/minio-operator/overlays/okd/route.yaml b/kubernetes/minio-operator/overlays/okd/route.yaml
@@ -1,17 +1,22 @@
-apiVersion: route.openshift.io/v1
-kind: Route
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
-  labels:
-    app.kubernetes.io/instance: minio-operator
   name: minio-operator
   namespace: minio-operator
+  labels:
+    app.kubernetes.io/instance: minio-operator
+  annotations:
+    route.openshift.io/termination: edge
 spec:
-  host: minio-operator.apps.okd.<path:secret/data/homelab/domain#url>
-  port:
-    targetPort: http
-  to:
-    kind: Service
-    name: console
-  tls:
-    termination: edge
-    insecureEdgeTerminationPolicy: Redirect
+  ingressClassName: openshift-default
+  rules:
+    - host: minio-operator.apps.okd.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: console
+                port:
+                  name: http
diff --git a/kubernetes/nextcloud/base/service.yaml b/kubernetes/nextcloud/base/service.yaml
@@ -12,5 +12,6 @@ spec:
     - protocol: TCP
       port: 443
       targetPort: 8443
+      name: https
   type: ClusterIP
   clusterIP: None
diff --git a/kubernetes/nextcloud/overlays/okd/route.yaml b/kubernetes/nextcloud/overlays/okd/route.yaml
@@ -1,20 +1,22 @@
-kind: Route
-apiVersion: route.openshift.io/v1
+kind: Ingress
+apiVersion: networking.k8s.io/v1
 metadata:
   name: nextcloud
   namespace: nextcloud
   labels:
-    app: nextcloud
     app.kubernetes.io/instance: nextcloud
+  annotations:
+    route.openshift.io/termination: passthrough
 spec:
-  host: nextcloud.<path:secret/data/homelab/domain#url>
-  to:
-    kind: Service
-    name: nextcloud
-    weight: 100
-  port:
-    targetPort: 8443
-  tls:
-    termination: passthrough
-    insecureEdgeTerminationPolicy: Redirect
-  wildcardPolicy: None
+  ingressClassName: openshift-default
+  rules:
+    - host: nextcloud.arthurvardevanyan.com
+      http:
+        paths:
+          - path: ""
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: nextcloud
+                port:
+                  name: https