From c7180f793a7f992ca90486c2dbb4f5b911ac1e21 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Tue, 26 Mar 2024 22:58:17 +0100 Subject: [PATCH] trying like that --- apps/adguard/ingress.yaml | 2 +- apps/finance/actualbudget.ingress.yaml | 2 +- apps/homeassistant/ingress.yaml | 4 ++-- apps/immich/ingress.yaml | 6 +++--- apps/monitoring/grafana.ingress.yaml | 2 +- apps/nextcloud/ingress.yaml | 2 +- apps/ntfy/ingress.yaml | 4 ++-- apps/ocis/ingress.yaml | 2 +- apps/recipes/ingress.yaml | 2 +- apps/rss/ingress.yaml | 2 +- apps/syncthing/ingress.yaml | 2 +- apps/todos/ingress.yaml | 2 +- apps/whoami/base/ingress.yaml | 2 +- infrastructure/argocd/ingress.yaml | 2 +- infrastructure/external/omv-s3.ingress.yaml | 2 +- infrastructure/external/openmediavault.ingress.yaml | 2 +- infrastructure/external/proxmox.ingress.yaml | 4 ++-- infrastructure/gitea/drone-server.deployment.yaml | 2 +- infrastructure/gitea/gitea.ingress.yaml | 2 +- infrastructure/traefik-system/kustomization.yaml | 4 +++- 20 files changed, 27 insertions(+), 25 deletions(-) diff --git a/apps/adguard/ingress.yaml b/apps/adguard/ingress.yaml index ea70bd1..473394b 100644 --- a/apps/adguard/ingress.yaml +++ b/apps/adguard/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRouteTCP metadata: name: adguard-tls-ingress diff --git a/apps/finance/actualbudget.ingress.yaml b/apps/finance/actualbudget.ingress.yaml index 65d6e2d..09b0150 100644 --- a/apps/finance/actualbudget.ingress.yaml +++ b/apps/finance/actualbudget.ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: actualbudget diff --git a/apps/homeassistant/ingress.yaml b/apps/homeassistant/ingress.yaml index 09895cc..30b7d86 100644 --- a/apps/homeassistant/ingress.yaml +++ b/apps/homeassistant/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: homeassistant-ingress @@ -17,7 +17,7 @@ spec: certResolver: default-tls --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: homeassistant-websocket diff --git a/apps/immich/ingress.yaml b/apps/immich/ingress.yaml index bbe1cd5..79456dd 100644 --- a/apps/immich/ingress.yaml +++ b/apps/immich/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: stripprefix @@ -7,7 +7,7 @@ spec: prefixes: - /api --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: websocket @@ -18,7 +18,7 @@ spec: # enable websockets Upgrade: "websocket" --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: immich-ingressroute diff --git a/apps/monitoring/grafana.ingress.yaml b/apps/monitoring/grafana.ingress.yaml index 980f5ce..e700750 100644 --- a/apps/monitoring/grafana.ingress.yaml +++ b/apps/monitoring/grafana.ingress.yaml @@ -1,5 +1,5 @@ kind: IngressRoute -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 metadata: name: grafana-ingress spec: diff --git a/apps/nextcloud/ingress.yaml b/apps/nextcloud/ingress.yaml index d35f61d..3cb2bd3 100644 --- a/apps/nextcloud/ingress.yaml +++ b/apps/nextcloud/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: nextcloud-ingressroute diff --git a/apps/ntfy/ingress.yaml b/apps/ntfy/ingress.yaml index 641e79a..3f2926d 100644 --- a/apps/ntfy/ingress.yaml +++ b/apps/ntfy/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: websocket @@ -9,7 +9,7 @@ spec: # enable websockets Upgrade: "websocket" --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: ntfy-ingressroute diff --git a/apps/ocis/ingress.yaml b/apps/ocis/ingress.yaml index 70f0f16..00f0d85 100644 --- a/apps/ocis/ingress.yaml +++ b/apps/ocis/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: ocis-ingressroute diff --git a/apps/recipes/ingress.yaml b/apps/recipes/ingress.yaml index 475e890..4cf8c30 100644 --- a/apps/recipes/ingress.yaml +++ b/apps/recipes/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: mealie-ingressroute diff --git a/apps/rss/ingress.yaml b/apps/rss/ingress.yaml index 29f3225..a62538e 100644 --- a/apps/rss/ingress.yaml +++ b/apps/rss/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: rss-ingressroute diff --git a/apps/syncthing/ingress.yaml b/apps/syncthing/ingress.yaml index 62166e3..16efbee 100644 --- a/apps/syncthing/ingress.yaml +++ b/apps/syncthing/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: rss-ingressroute diff --git a/apps/todos/ingress.yaml b/apps/todos/ingress.yaml index 0904ff5..a080cf9 100644 --- a/apps/todos/ingress.yaml +++ b/apps/todos/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: todos-ingressroute diff --git a/apps/whoami/base/ingress.yaml b/apps/whoami/base/ingress.yaml index 1d23aa9..e1a8c16 100644 --- a/apps/whoami/base/ingress.yaml +++ b/apps/whoami/base/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: namespace: whoami diff --git a/infrastructure/argocd/ingress.yaml b/infrastructure/argocd/ingress.yaml index c5be5e1..455045b 100644 --- a/infrastructure/argocd/ingress.yaml +++ b/infrastructure/argocd/ingress.yaml @@ -1,5 +1,5 @@ --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: argocd-ingressroute diff --git a/infrastructure/external/omv-s3.ingress.yaml b/infrastructure/external/omv-s3.ingress.yaml index cde38a2..8fa4738 100644 --- a/infrastructure/external/omv-s3.ingress.yaml +++ b/infrastructure/external/omv-s3.ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: omv-s3-ingressroute diff --git a/infrastructure/external/openmediavault.ingress.yaml b/infrastructure/external/openmediavault.ingress.yaml index 1f83cfe..c9847ab 100644 --- a/infrastructure/external/openmediavault.ingress.yaml +++ b/infrastructure/external/openmediavault.ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: omv-ingressroute diff --git a/infrastructure/external/proxmox.ingress.yaml b/infrastructure/external/proxmox.ingress.yaml index 0c81199..cc2d996 100644 --- a/infrastructure/external/proxmox.ingress.yaml +++ b/infrastructure/external/proxmox.ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: proxmox-ingressroute @@ -19,7 +19,7 @@ spec: tls: certResolver: default-tls --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: name: proxmox-websocket diff --git a/infrastructure/gitea/drone-server.deployment.yaml b/infrastructure/gitea/drone-server.deployment.yaml index b53a66d..9fbda6a 100644 --- a/infrastructure/gitea/drone-server.deployment.yaml +++ b/infrastructure/gitea/drone-server.deployment.yaml @@ -71,7 +71,7 @@ spec: selector: app: drone-server --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: drone-server-ingress diff --git a/infrastructure/gitea/gitea.ingress.yaml b/infrastructure/gitea/gitea.ingress.yaml index 2d9bbf1..d37a445 100644 --- a/infrastructure/gitea/gitea.ingress.yaml +++ b/infrastructure/gitea/gitea.ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: gitea-ingress diff --git a/infrastructure/traefik-system/kustomization.yaml b/infrastructure/traefik-system/kustomization.yaml index 65ffca1..6d1b694 100644 --- a/infrastructure/traefik-system/kustomization.yaml +++ b/infrastructure/traefik-system/kustomization.yaml @@ -5,6 +5,8 @@ resources: - pvc.yaml - configmap.yaml - servicemonitor.yaml + - https://raw.githubusercontent.com/traefik/traefik/v2.11/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml + - https://raw.githubusercontent.com/traefik/traefik/v2.11/docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml namespace: traefik-system @@ -13,4 +15,4 @@ helmCharts: releaseName: traefik version: 26.1.0 valuesFile: values.yaml - repo: https://helm.traefik.io/traefik + repo: https://traefik.github.io/charts