diff --git a/clusters/cl01tl-standby/applications/kiwix/Chart.yaml b/clusters/cl01tl/applications/kiwix/Chart.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/kiwix/Chart.yaml rename to clusters/cl01tl/applications/kiwix/Chart.yaml diff --git a/clusters/cl01tl/applications/kiwix/templates/http-route.yaml b/clusters/cl01tl/applications/kiwix/templates/http-route.yaml new file mode 100644 index 000000000..4a8c7054b --- /dev/null +++ b/clusters/cl01tl/applications/kiwix/templates/http-route.yaml @@ -0,0 +1,30 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: http-route-kiwix + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: http-route-kiwix + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: web + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + parentRefs: + - group: gateway.networking.k8s.io + kind: Gateway + name: traefik-gateway + namespace: traefik + hostnames: + - kiwix.alexlebens.net + rules: + - matches: + - path: + type: PathPrefix + value: / + backendRefs: + - group: '' + kind: Service + name: kiwix + port: 80 + weight: 100 diff --git a/clusters/cl01tl-standby/applications/kiwix/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/kiwix/templates/persistent-volume-claim.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/kiwix/templates/persistent-volume-claim.yaml rename to clusters/cl01tl/applications/kiwix/templates/persistent-volume-claim.yaml diff --git a/clusters/cl01tl-standby/applications/kiwix/templates/persistent-volume.yaml b/clusters/cl01tl/applications/kiwix/templates/persistent-volume.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/kiwix/templates/persistent-volume.yaml rename to clusters/cl01tl/applications/kiwix/templates/persistent-volume.yaml diff --git a/clusters/cl01tl-standby/applications/kiwix/values.yaml b/clusters/cl01tl/applications/kiwix/values.yaml similarity index 72% rename from clusters/cl01tl-standby/applications/kiwix/values.yaml rename to clusters/cl01tl/applications/kiwix/values.yaml index 8f078c742..2ce81d1a1 100644 --- a/clusters/cl01tl-standby/applications/kiwix/values.yaml +++ b/clusters/cl01tl/applications/kiwix/values.yaml @@ -30,21 +30,6 @@ kiwix: port: 80 targetPort: 8080 protocol: HTTP - ingress: - tailscale: - enabled: true - className: tailscale - hosts: - - host: kiwix-cl01tl - paths: - - path: / - pathType: Prefix - service: - name: kiwix - port: 80 - tls: - - hosts: - - kiwix-cl01tl persistence: media: existingClaim: kiwix-nfs-storage diff --git a/clusters/cl01tl-standby/applications/libation/Chart.yaml b/clusters/cl01tl/applications/libation/Chart.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/libation/Chart.yaml rename to clusters/cl01tl/applications/libation/Chart.yaml diff --git a/clusters/cl01tl-standby/applications/libation/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/libation/templates/persistent-volume-claim.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/libation/templates/persistent-volume-claim.yaml rename to clusters/cl01tl/applications/libation/templates/persistent-volume-claim.yaml diff --git a/clusters/cl01tl-standby/applications/libation/templates/persistent-volume.yaml b/clusters/cl01tl/applications/libation/templates/persistent-volume.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/libation/templates/persistent-volume.yaml rename to clusters/cl01tl/applications/libation/templates/persistent-volume.yaml diff --git a/clusters/cl01tl-standby/applications/libation/values.yaml b/clusters/cl01tl/applications/libation/values.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/libation/values.yaml rename to clusters/cl01tl/applications/libation/values.yaml diff --git a/clusters/cl01tl-standby/applications/plex/Chart.yaml b/clusters/cl01tl/applications/plex/Chart.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/plex/Chart.yaml rename to clusters/cl01tl/applications/plex/Chart.yaml diff --git a/clusters/cl01tl/applications/plex/templates/http-route.yaml b/clusters/cl01tl/applications/plex/templates/http-route.yaml new file mode 100644 index 000000000..67b06b3bd --- /dev/null +++ b/clusters/cl01tl/applications/plex/templates/http-route.yaml @@ -0,0 +1,30 @@ +apiVersion: gateway.networking.k8s.io/v1 +kind: HTTPRoute +metadata: + name: http-route-plex + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: http-route-plex + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: web + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + parentRefs: + - group: gateway.networking.k8s.io + kind: Gateway + name: traefik-gateway + namespace: traefik + hostnames: + - plex.alexlebens.net + rules: + - matches: + - path: + type: PathPrefix + value: / + backendRefs: + - group: '' + kind: Service + name: plex + port: 32400 + weight: 100 diff --git a/clusters/cl01tl-standby/applications/plex/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/plex/templates/persistent-volume-claim.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/plex/templates/persistent-volume-claim.yaml rename to clusters/cl01tl/applications/plex/templates/persistent-volume-claim.yaml diff --git a/clusters/cl01tl-standby/applications/plex/templates/persistent-volume.yaml b/clusters/cl01tl/applications/plex/templates/persistent-volume.yaml similarity index 100% rename from clusters/cl01tl-standby/applications/plex/templates/persistent-volume.yaml rename to clusters/cl01tl/applications/plex/templates/persistent-volume.yaml diff --git a/clusters/cl01tl-standby/applications/plex/values.yaml b/clusters/cl01tl/applications/plex/values.yaml similarity index 61% rename from clusters/cl01tl-standby/applications/plex/values.yaml rename to clusters/cl01tl/applications/plex/values.yaml index 54a88231b..7dbe8c7a5 100644 --- a/clusters/cl01tl-standby/applications/plex/values.yaml +++ b/clusters/cl01tl/applications/plex/values.yaml @@ -29,45 +29,12 @@ plex: service: main: controller: main + # type: LoadBalancer ports: http: port: 32400 targetPort: 32400 protocol: HTTP - ingress: - tailscale: - enabled: true - className: tailscale - hosts: - - host: plex-cl01tl - paths: - - path: / - pathType: Prefix - service: - name: plex - port: 32400 - tls: - - hosts: - - plex-cl01tl - traefik: - enabled: true - className: traefik - annotations: - traefik.ingress.kubernetes.io/router.entrypoints: websecure - traefik.ingress.kubernetes.io/router.tls: "true" - cert-manager.io/cluster-issuer: letsencrypt-issuer - hosts: - - host: plex.alexlebens.net - paths: - - path: / - pathType: Prefix - service: - name: plex - port: 32400 - tls: - - hosts: - - plex.alexlebens.net - secretName: plex-tls-secret persistence: config: storageClass: ceph-block