From 19f81dcfc52baddfbeafb87050aef7bae2c92a45 Mon Sep 17 00:00:00 2001 From: Morten Olsen Date: Thu, 1 Jan 2026 09:51:03 +0100 Subject: [PATCH] remove external proxy --- .../woodpecker-external-http-service.yaml | 12 ------ .../templates/external-http-service.yaml | 11 ------ .../homarr/templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../homebox/templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../immich/templates/virtual-service.yaml | 39 +++++++++++++++++++ .../templates/external-http-service.yaml | 11 ------ .../templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../mealie/templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../memos/templates/virtual-service.yaml | 25 +++++++++++- apps/charts/metabase/templates/_client.yaml | 10 ----- .../templates/_external-http-service.yaml | 11 ------ .../metabase/templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../metamcp/templates/virtual-service.yaml | 25 +++++++++++- .../templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../miniflux/templates/virtual-service.yaml | 25 +++++++++++- .../templates/_external-http-service.yaml | 11 ------ .../templates/virtual-service.yaml | 5 ++- .../mqtt/templates/virtual-service.yaml | 2 +- .../templates/virtual-service.yaml | 2 +- .../n8n/templates/external-http-service.yaml | 11 ------ .../charts/n8n/templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../templates/virtual-service.yaml | 5 ++- .../ntfy/templates/external-http-service.yaml | 11 ------ .../ntfy/templates/virtual-service.yaml | 25 +++++++++++- .../ollama/templates/virtual-service.yaml | 5 ++- .../templates/external-http-service.yaml | 11 ------ .../openwebui/templates/virtual-service.yaml | 25 +++++++++++- .../{penpot => penpot.disabled}/Chart.yaml | 0 .../templates/client.yaml | 0 .../templates/database.yaml | 0 .../templates/deployment.yaml | 0 .../templates/pvc.yaml | 0 .../templates/service.yaml | 0 .../templates/virtual-service.yaml | 39 +++++++++++++++++++ .../{penpot => penpot.disabled}/values.yaml | 0 .../templates/external-http-service.yaml | 11 ------ .../penpot/templates/virtual-service.yaml | 18 --------- .../Chart.yaml | 0 .../templates/client.yaml | 0 .../templates/deployment.yaml | 0 .../templates/pvc.yaml | 0 .../templates/secret.yaml | 0 .../templates/service.yaml | 0 .../templates/virtual-service.yaml | 39 +++++++++++++++++++ .../values.yaml | 0 .../templates/external-http-service.yaml | 11 ------ .../photoprism/templates/virtual-service.yaml | 18 --------- .../templates/external-http-service.yaml | 11 ------ .../templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../readeck/templates/virtual-service.yaml | 25 +++++++++++- .../reservoir/templates/virtual-service.yaml | 5 ++- .../templates/external-http-service.yaml | 11 ------ .../templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../syncthing/templates/virtual-service.yaml | 5 ++- .../templates/external-http-service.yaml | 11 ------ .../umami/templates/virtual-service.yaml | 25 +++++++++++- .../templates/virtual-service.yaml | 5 ++- .../templates/external-http-service.yaml | 11 ------ .../templates/virtual-service.yaml | 25 +++++++++++- .../templates/external-http-service.yaml | 11 ------ .../vikunja/templates/virtual-service.yaml | 25 +++++++++++- .../zerobyte/templates/virtual-service.yaml | 5 ++- 71 files changed, 554 insertions(+), 363 deletions(-) delete mode 100644 apps/charts/forgejo/templates/woodpecker-external-http-service.yaml delete mode 100644 apps/charts/homarr/templates/external-http-service.yaml delete mode 100644 apps/charts/homebox/templates/external-http-service.yaml delete mode 100644 apps/charts/immich/templates/external-http-service.yaml create mode 100644 apps/charts/immich/templates/virtual-service.yaml delete mode 100644 apps/charts/linkwarden.disabled/templates/external-http-service.yaml delete mode 100644 apps/charts/mealie/templates/external-http-service.yaml delete mode 100644 apps/charts/memos/templates/external-http-service.yaml delete mode 100644 apps/charts/metabase/templates/_client.yaml delete mode 100644 apps/charts/metabase/templates/_external-http-service.yaml delete mode 100644 apps/charts/metamcp/templates/external-http-service.yaml delete mode 100644 apps/charts/miniflux/templates/external-http-service.yaml delete mode 100644 apps/charts/mollysocket/templates/_external-http-service.yaml delete mode 100644 apps/charts/n8n/templates/external-http-service.yaml delete mode 100644 apps/charts/nocodb.disabled/templates/external-http-service.yaml delete mode 100644 apps/charts/ntfy/templates/external-http-service.yaml delete mode 100644 apps/charts/openwebui/templates/external-http-service.yaml rename apps/charts/{penpot => penpot.disabled}/Chart.yaml (100%) rename apps/charts/{penpot => penpot.disabled}/templates/client.yaml (100%) rename apps/charts/{penpot => penpot.disabled}/templates/database.yaml (100%) rename apps/charts/{penpot => penpot.disabled}/templates/deployment.yaml (100%) rename apps/charts/{penpot => penpot.disabled}/templates/pvc.yaml (100%) rename apps/charts/{penpot => penpot.disabled}/templates/service.yaml (100%) create mode 100644 apps/charts/penpot.disabled/templates/virtual-service.yaml rename apps/charts/{penpot => penpot.disabled}/values.yaml (100%) delete mode 100644 apps/charts/penpot/templates/external-http-service.yaml delete mode 100644 apps/charts/penpot/templates/virtual-service.yaml rename apps/charts/{photoprism => photoprism.disabled}/Chart.yaml (100%) rename apps/charts/{photoprism => photoprism.disabled}/templates/client.yaml (100%) rename apps/charts/{photoprism => photoprism.disabled}/templates/deployment.yaml (100%) rename apps/charts/{photoprism => photoprism.disabled}/templates/pvc.yaml (100%) rename apps/charts/{photoprism => photoprism.disabled}/templates/secret.yaml (100%) rename apps/charts/{photoprism => photoprism.disabled}/templates/service.yaml (100%) create mode 100644 apps/charts/photoprism.disabled/templates/virtual-service.yaml rename apps/charts/{photoprism => photoprism.disabled}/values.yaml (100%) delete mode 100644 apps/charts/photoprism/templates/external-http-service.yaml delete mode 100644 apps/charts/photoprism/templates/virtual-service.yaml delete mode 100644 apps/charts/pigeon-pod.disabled/templates/external-http-service.yaml delete mode 100644 apps/charts/readeck/templates/external-http-service.yaml delete mode 100644 apps/charts/siyuan.disabled/templates/external-http-service.yaml delete mode 100644 apps/charts/syncthing/templates/external-http-service.yaml delete mode 100644 apps/charts/umami/templates/external-http-service.yaml delete mode 100644 apps/charts/vaultwarden/templates/external-http-service.yaml delete mode 100644 apps/charts/vikunja/templates/external-http-service.yaml diff --git a/apps/charts/forgejo/templates/woodpecker-external-http-service.yaml b/apps/charts/forgejo/templates/woodpecker-external-http-service.yaml deleted file mode 100644 index f79dd47..0000000 --- a/apps/charts/forgejo/templates/woodpecker-external-http-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: "{{ .Release.Name }}-woodpecker" - -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: 'woodpecker' - destination: - host: 'woodpecker-server.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/homarr/templates/external-http-service.yaml b/apps/charts/homarr/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/homarr/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/homarr/templates/virtual-service.yaml b/apps/charts/homarr/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/homarr/templates/virtual-service.yaml +++ b/apps/charts/homarr/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/homebox/templates/external-http-service.yaml b/apps/charts/homebox/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/homebox/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/homebox/templates/virtual-service.yaml b/apps/charts/homebox/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/homebox/templates/virtual-service.yaml +++ b/apps/charts/homebox/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/immich/templates/external-http-service.yaml b/apps/charts/immich/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/immich/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/immich/templates/virtual-service.yaml b/apps/charts/immich/templates/virtual-service.yaml new file mode 100644 index 0000000..36e9d43 --- /dev/null +++ b/apps/charts/immich/templates/virtual-service.yaml @@ -0,0 +1,39 @@ +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-public" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.public }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/linkwarden.disabled/templates/external-http-service.yaml b/apps/charts/linkwarden.disabled/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/linkwarden.disabled/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/linkwarden.disabled/templates/virtual-service.yaml b/apps/charts/linkwarden.disabled/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/linkwarden.disabled/templates/virtual-service.yaml +++ b/apps/charts/linkwarden.disabled/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/mealie/templates/external-http-service.yaml b/apps/charts/mealie/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/mealie/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/mealie/templates/virtual-service.yaml b/apps/charts/mealie/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/mealie/templates/virtual-service.yaml +++ b/apps/charts/mealie/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/memos/templates/external-http-service.yaml b/apps/charts/memos/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/memos/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/memos/templates/virtual-service.yaml b/apps/charts/memos/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/memos/templates/virtual-service.yaml +++ b/apps/charts/memos/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/metabase/templates/_client.yaml b/apps/charts/metabase/templates/_client.yaml deleted file mode 100644 index 60befa2..0000000 --- a/apps/charts/metabase/templates/_client.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: OidcClient -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - redirectUris: - - path: /api/auth/oidc/callback - subdomain: '{{ .Values.subdomain }}' - matchingMode: strict diff --git a/apps/charts/metabase/templates/_external-http-service.yaml b/apps/charts/metabase/templates/_external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/metabase/templates/_external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/metabase/templates/virtual-service.yaml b/apps/charts/metabase/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/metabase/templates/virtual-service.yaml +++ b/apps/charts/metabase/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/metamcp/templates/external-http-service.yaml b/apps/charts/metamcp/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/metamcp/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/metamcp/templates/virtual-service.yaml b/apps/charts/metamcp/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/metamcp/templates/virtual-service.yaml +++ b/apps/charts/metamcp/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/mindsdb.disabled/templates/virtual-service.yaml b/apps/charts/mindsdb.disabled/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/mindsdb.disabled/templates/virtual-service.yaml +++ b/apps/charts/mindsdb.disabled/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/miniflux/templates/external-http-service.yaml b/apps/charts/miniflux/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/miniflux/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/miniflux/templates/virtual-service.yaml b/apps/charts/miniflux/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/miniflux/templates/virtual-service.yaml +++ b/apps/charts/miniflux/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/mollysocket/templates/_external-http-service.yaml b/apps/charts/mollysocket/templates/_external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/mollysocket/templates/_external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/mollysocket/templates/virtual-service.yaml b/apps/charts/mollysocket/templates/virtual-service.yaml index 0af9b24..381dc10 100644 --- a/apps/charts/mollysocket/templates/virtual-service.yaml +++ b/apps/charts/mollysocket/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,4 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + diff --git a/apps/charts/mqtt/templates/virtual-service.yaml b/apps/charts/mqtt/templates/virtual-service.yaml index 0af9b24..1c017df 100644 --- a/apps/charts/mqtt/templates/virtual-service.yaml +++ b/apps/charts/mqtt/templates/virtual-service.yaml @@ -5,7 +5,7 @@ metadata: namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.private }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" diff --git a/apps/charts/music-assistant/templates/virtual-service.yaml b/apps/charts/music-assistant/templates/virtual-service.yaml index 0af9b24..1c017df 100644 --- a/apps/charts/music-assistant/templates/virtual-service.yaml +++ b/apps/charts/music-assistant/templates/virtual-service.yaml @@ -5,7 +5,7 @@ metadata: namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.private }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" diff --git a/apps/charts/n8n/templates/external-http-service.yaml b/apps/charts/n8n/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/n8n/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/n8n/templates/virtual-service.yaml b/apps/charts/n8n/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/n8n/templates/virtual-service.yaml +++ b/apps/charts/n8n/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/nocodb.disabled/templates/external-http-service.yaml b/apps/charts/nocodb.disabled/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/nocodb.disabled/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/nocodb.disabled/templates/virtual-service.yaml b/apps/charts/nocodb.disabled/templates/virtual-service.yaml index 0af9b24..381dc10 100644 --- a/apps/charts/nocodb.disabled/templates/virtual-service.yaml +++ b/apps/charts/nocodb.disabled/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,4 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + diff --git a/apps/charts/ntfy/templates/external-http-service.yaml b/apps/charts/ntfy/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/ntfy/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/ntfy/templates/virtual-service.yaml b/apps/charts/ntfy/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/ntfy/templates/virtual-service.yaml +++ b/apps/charts/ntfy/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/ollama/templates/virtual-service.yaml b/apps/charts/ollama/templates/virtual-service.yaml index 0af9b24..381dc10 100644 --- a/apps/charts/ollama/templates/virtual-service.yaml +++ b/apps/charts/ollama/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,4 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + diff --git a/apps/charts/openwebui/templates/external-http-service.yaml b/apps/charts/openwebui/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/openwebui/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/openwebui/templates/virtual-service.yaml b/apps/charts/openwebui/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/openwebui/templates/virtual-service.yaml +++ b/apps/charts/openwebui/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/penpot/Chart.yaml b/apps/charts/penpot.disabled/Chart.yaml similarity index 100% rename from apps/charts/penpot/Chart.yaml rename to apps/charts/penpot.disabled/Chart.yaml diff --git a/apps/charts/penpot/templates/client.yaml b/apps/charts/penpot.disabled/templates/client.yaml similarity index 100% rename from apps/charts/penpot/templates/client.yaml rename to apps/charts/penpot.disabled/templates/client.yaml diff --git a/apps/charts/penpot/templates/database.yaml b/apps/charts/penpot.disabled/templates/database.yaml similarity index 100% rename from apps/charts/penpot/templates/database.yaml rename to apps/charts/penpot.disabled/templates/database.yaml diff --git a/apps/charts/penpot/templates/deployment.yaml b/apps/charts/penpot.disabled/templates/deployment.yaml similarity index 100% rename from apps/charts/penpot/templates/deployment.yaml rename to apps/charts/penpot.disabled/templates/deployment.yaml diff --git a/apps/charts/penpot/templates/pvc.yaml b/apps/charts/penpot.disabled/templates/pvc.yaml similarity index 100% rename from apps/charts/penpot/templates/pvc.yaml rename to apps/charts/penpot.disabled/templates/pvc.yaml diff --git a/apps/charts/penpot/templates/service.yaml b/apps/charts/penpot.disabled/templates/service.yaml similarity index 100% rename from apps/charts/penpot/templates/service.yaml rename to apps/charts/penpot.disabled/templates/service.yaml diff --git a/apps/charts/penpot.disabled/templates/virtual-service.yaml b/apps/charts/penpot.disabled/templates/virtual-service.yaml new file mode 100644 index 0000000..36e9d43 --- /dev/null +++ b/apps/charts/penpot.disabled/templates/virtual-service.yaml @@ -0,0 +1,39 @@ +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-public" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.public }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/penpot/values.yaml b/apps/charts/penpot.disabled/values.yaml similarity index 100% rename from apps/charts/penpot/values.yaml rename to apps/charts/penpot.disabled/values.yaml diff --git a/apps/charts/penpot/templates/external-http-service.yaml b/apps/charts/penpot/templates/external-http-service.yaml deleted file mode 100644 index ffb7a52..0000000 --- a/apps/charts/penpot/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: "{{ .Release.Name }}" -spec: - environment: "{{ .Values.globals.environment }}" - subdomain: "{{ .Values.frontend.subdomain }}" - destination: - host: "{{ .Release.Name }}-frontend.{{ .Release.Namespace }}.svc.cluster.local" - port: - number: 80 diff --git a/apps/charts/penpot/templates/virtual-service.yaml b/apps/charts/penpot/templates/virtual-service.yaml deleted file mode 100644 index 28a7390..0000000 --- a/apps/charts/penpot/templates/virtual-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: networking.istio.io/v1 -kind: VirtualService -metadata: - name: "{{ .Release.Name }}" - namespace: "{{ .Release.Namespace }}" -spec: - gateways: - - "{{ .Values.globals.istio.gateway }}" - - mesh - hosts: - - "{{ .Values.frontend.subdomain }}.{{ .Values.globals.domain }}" - - mesh - http: - - route: - - destination: - host: "{{ .Release.Name }}-frontend" - port: - number: 80 diff --git a/apps/charts/photoprism/Chart.yaml b/apps/charts/photoprism.disabled/Chart.yaml similarity index 100% rename from apps/charts/photoprism/Chart.yaml rename to apps/charts/photoprism.disabled/Chart.yaml diff --git a/apps/charts/photoprism/templates/client.yaml b/apps/charts/photoprism.disabled/templates/client.yaml similarity index 100% rename from apps/charts/photoprism/templates/client.yaml rename to apps/charts/photoprism.disabled/templates/client.yaml diff --git a/apps/charts/photoprism/templates/deployment.yaml b/apps/charts/photoprism.disabled/templates/deployment.yaml similarity index 100% rename from apps/charts/photoprism/templates/deployment.yaml rename to apps/charts/photoprism.disabled/templates/deployment.yaml diff --git a/apps/charts/photoprism/templates/pvc.yaml b/apps/charts/photoprism.disabled/templates/pvc.yaml similarity index 100% rename from apps/charts/photoprism/templates/pvc.yaml rename to apps/charts/photoprism.disabled/templates/pvc.yaml diff --git a/apps/charts/photoprism/templates/secret.yaml b/apps/charts/photoprism.disabled/templates/secret.yaml similarity index 100% rename from apps/charts/photoprism/templates/secret.yaml rename to apps/charts/photoprism.disabled/templates/secret.yaml diff --git a/apps/charts/photoprism/templates/service.yaml b/apps/charts/photoprism.disabled/templates/service.yaml similarity index 100% rename from apps/charts/photoprism/templates/service.yaml rename to apps/charts/photoprism.disabled/templates/service.yaml diff --git a/apps/charts/photoprism.disabled/templates/virtual-service.yaml b/apps/charts/photoprism.disabled/templates/virtual-service.yaml new file mode 100644 index 0000000..36e9d43 --- /dev/null +++ b/apps/charts/photoprism.disabled/templates/virtual-service.yaml @@ -0,0 +1,39 @@ +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-public" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.public }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/photoprism/values.yaml b/apps/charts/photoprism.disabled/values.yaml similarity index 100% rename from apps/charts/photoprism/values.yaml rename to apps/charts/photoprism.disabled/values.yaml diff --git a/apps/charts/photoprism/templates/external-http-service.yaml b/apps/charts/photoprism/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/photoprism/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/photoprism/templates/virtual-service.yaml b/apps/charts/photoprism/templates/virtual-service.yaml deleted file mode 100644 index 0af9b24..0000000 --- a/apps/charts/photoprism/templates/virtual-service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: networking.istio.io/v1 -kind: VirtualService -metadata: - name: "{{ .Release.Name }}" - namespace: "{{ .Release.Namespace }}" -spec: - gateways: - - "{{ .Values.globals.istio.gateway }}" - - mesh - hosts: - - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" - - mesh - http: - - route: - - destination: - host: "{{ .Release.Name }}" - port: - number: 80 diff --git a/apps/charts/pigeon-pod.disabled/templates/external-http-service.yaml b/apps/charts/pigeon-pod.disabled/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/pigeon-pod.disabled/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/pigeon-pod.disabled/templates/virtual-service.yaml b/apps/charts/pigeon-pod.disabled/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/pigeon-pod.disabled/templates/virtual-service.yaml +++ b/apps/charts/pigeon-pod.disabled/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/readeck/templates/external-http-service.yaml b/apps/charts/readeck/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/readeck/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/readeck/templates/virtual-service.yaml b/apps/charts/readeck/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/readeck/templates/virtual-service.yaml +++ b/apps/charts/readeck/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/reservoir/templates/virtual-service.yaml b/apps/charts/reservoir/templates/virtual-service.yaml index 0af9b24..a9b195e 100644 --- a/apps/charts/reservoir/templates/virtual-service.yaml +++ b/apps/charts/reservoir/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-private" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.private }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,4 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + diff --git a/apps/charts/siyuan.disabled/templates/external-http-service.yaml b/apps/charts/siyuan.disabled/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/siyuan.disabled/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/siyuan.disabled/templates/virtual-service.yaml b/apps/charts/siyuan.disabled/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/siyuan.disabled/templates/virtual-service.yaml +++ b/apps/charts/siyuan.disabled/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/syncthing/templates/external-http-service.yaml b/apps/charts/syncthing/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/syncthing/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/syncthing/templates/virtual-service.yaml b/apps/charts/syncthing/templates/virtual-service.yaml index 0af9b24..a9b195e 100644 --- a/apps/charts/syncthing/templates/virtual-service.yaml +++ b/apps/charts/syncthing/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-private" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.private }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,4 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + diff --git a/apps/charts/umami/templates/external-http-service.yaml b/apps/charts/umami/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/umami/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/umami/templates/virtual-service.yaml b/apps/charts/umami/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/umami/templates/virtual-service.yaml +++ b/apps/charts/umami/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/uptime-kuma/templates/virtual-service.yaml b/apps/charts/uptime-kuma/templates/virtual-service.yaml index 0af9b24..a9b195e 100644 --- a/apps/charts/uptime-kuma/templates/virtual-service.yaml +++ b/apps/charts/uptime-kuma/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-private" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.private }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,4 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + diff --git a/apps/charts/vaultwarden/templates/external-http-service.yaml b/apps/charts/vaultwarden/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/vaultwarden/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/vaultwarden/templates/virtual-service.yaml b/apps/charts/vaultwarden/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/vaultwarden/templates/virtual-service.yaml +++ b/apps/charts/vaultwarden/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/vikunja/templates/external-http-service.yaml b/apps/charts/vikunja/templates/external-http-service.yaml deleted file mode 100644 index e28916d..0000000 --- a/apps/charts/vikunja/templates/external-http-service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: homelab.mortenolsen.pro/v1 -kind: ExternalHttpService -metadata: - name: '{{ .Release.Name }}' -spec: - environment: '{{ .Values.globals.environment }}' - subdomain: '{{ .Values.subdomain }}' - destination: - host: '{{ .Release.Name }}.{{ .Release.Namespace }}.svc.cluster.local' - port: - number: 80 diff --git a/apps/charts/vikunja/templates/virtual-service.yaml b/apps/charts/vikunja/templates/virtual-service.yaml index 0af9b24..36e9d43 100644 --- a/apps/charts/vikunja/templates/virtual-service.yaml +++ b/apps/charts/vikunja/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-public" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.public }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,24 @@ spec: host: "{{ .Release.Name }}" port: number: 80 + +--- +apiVersion: networking.istio.io/v1 +kind: VirtualService +metadata: + name: "{{ .Release.Name }}-private" + namespace: "{{ .Release.Namespace }}" +spec: + gateways: + - "{{ .Values.globals.istio.gateways.private }}" + - mesh + hosts: + - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" + - mesh + http: + - route: + - destination: + host: "{{ .Release.Name }}" + port: + number: 80 + diff --git a/apps/charts/zerobyte/templates/virtual-service.yaml b/apps/charts/zerobyte/templates/virtual-service.yaml index 0af9b24..a9b195e 100644 --- a/apps/charts/zerobyte/templates/virtual-service.yaml +++ b/apps/charts/zerobyte/templates/virtual-service.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1 kind: VirtualService metadata: - name: "{{ .Release.Name }}" + name: "{{ .Release.Name }}-private" namespace: "{{ .Release.Namespace }}" spec: gateways: - - "{{ .Values.globals.istio.gateway }}" + - "{{ .Values.globals.istio.gateways.private }}" - mesh hosts: - "{{ .Values.subdomain }}.{{ .Values.globals.domain }}" @@ -16,3 +16,4 @@ spec: host: "{{ .Release.Name }}" port: number: 80 +