From 28d0754196c376c8dadf209016c64022f4d5241f Mon Sep 17 00:00:00 2001 From: Steffen Illium Date: Fri, 29 Mar 2024 21:33:32 +0100 Subject: [PATCH] name replacements --- infrastructure/03-traefik/base/deployment-traefik.yaml | 2 +- infrastructure/03-traefik/base/kustomization.yaml | 1 - infrastructure/03-traefik/kustomization.yaml | 8 +++++--- .../patches/traefik-deployment-patch.yaml | 6 +++--- .../foreign/home-assistant/home-assistant-ingress.yaml | 0 .../foreign/home-assistant/home-assistant-service.yaml | 0 .../foreign/home-assistant/kustomization.yaml | 0 .../{base => overlay-internal}/foreign/kustomization.yaml | 0 .../03-traefik/overlay-internal/kustomization.yaml | 1 + 9 files changed, 10 insertions(+), 8 deletions(-) rename infrastructure/03-traefik/{base => overlay-internal}/foreign/home-assistant/home-assistant-ingress.yaml (100%) rename infrastructure/03-traefik/{base => overlay-internal}/foreign/home-assistant/home-assistant-service.yaml (100%) rename infrastructure/03-traefik/{base => overlay-internal}/foreign/home-assistant/kustomization.yaml (100%) rename infrastructure/03-traefik/{base => overlay-internal}/foreign/kustomization.yaml (100%) diff --git a/infrastructure/03-traefik/base/deployment-traefik.yaml b/infrastructure/03-traefik/base/deployment-traefik.yaml index 4c98b6c..d5db8bd 100644 --- a/infrastructure/03-traefik/base/deployment-traefik.yaml +++ b/infrastructure/03-traefik/base/deployment-traefik.yaml @@ -41,7 +41,7 @@ spec: - --providers.kubernetescrd.allowExternalNameServices=true - --providers.kubernetesingress - --providers.kubernetesingress.allowExternalNameServices=true - - --entrypoints.websecure.http.middlewares=traefik-default-headers + - --entrypoints.websecure.http.middlewares=local-default-headers - --entrypoints.websecure.http.tls=true - --entrypoints.websecure.http.tls.certResolver=default - --log.level=WARN diff --git a/infrastructure/03-traefik/base/kustomization.yaml b/infrastructure/03-traefik/base/kustomization.yaml index 9220657..1fd27c8 100644 --- a/infrastructure/03-traefik/base/kustomization.yaml +++ b/infrastructure/03-traefik/base/kustomization.yaml @@ -7,7 +7,6 @@ resources: - traefik-adguard-service-udp-dns.yaml - traefik-middleware-default-headers.yaml - traefik-service.yaml -- foreign - networking - security diff --git a/infrastructure/03-traefik/kustomization.yaml b/infrastructure/03-traefik/kustomization.yaml index 9fec385..40de9c5 100644 --- a/infrastructure/03-traefik/kustomization.yaml +++ b/infrastructure/03-traefik/kustomization.yaml @@ -1,7 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization namespace: traefik resources: - - overlay-internal - - overlay-external - \ No newline at end of file +- overlay-internal +- overlay-external + diff --git a/infrastructure/03-traefik/overlay-external/patches/traefik-deployment-patch.yaml b/infrastructure/03-traefik/overlay-external/patches/traefik-deployment-patch.yaml index 9c1d489..a267fa7 100644 --- a/infrastructure/03-traefik/overlay-external/patches/traefik-deployment-patch.yaml +++ b/infrastructure/03-traefik/overlay-external/patches/traefik-deployment-patch.yaml @@ -10,8 +10,8 @@ spec: containers: - name: traefik args: - - '--providers.kubernetescrd.labelSelector=expose=true' - - '--serversTransport.insecureSkipVerify=false' + - --providers.kubernetescrd.labelSelector=expose=true + - --serversTransport.insecureSkipVerify=false # Shared - --global.sendanonymoususage=false - --global.checknewversion=false @@ -28,7 +28,7 @@ spec: - --providers.kubernetescrd.allowExternalNameServices=true - --providers.kubernetesingress - --providers.kubernetesingress.allowExternalNameServices=true - - --entrypoints.websecure.http.middlewares=traefik-default-headers + - --entrypoints.websecure.http.middlewares=front-default-headers - --entrypoints.websecure.http.tls=true - --entrypoints.websecure.http.tls.certResolver=default - --log.level=WARN diff --git a/infrastructure/03-traefik/base/foreign/home-assistant/home-assistant-ingress.yaml b/infrastructure/03-traefik/overlay-internal/foreign/home-assistant/home-assistant-ingress.yaml similarity index 100% rename from infrastructure/03-traefik/base/foreign/home-assistant/home-assistant-ingress.yaml rename to infrastructure/03-traefik/overlay-internal/foreign/home-assistant/home-assistant-ingress.yaml diff --git a/infrastructure/03-traefik/base/foreign/home-assistant/home-assistant-service.yaml b/infrastructure/03-traefik/overlay-internal/foreign/home-assistant/home-assistant-service.yaml similarity index 100% rename from infrastructure/03-traefik/base/foreign/home-assistant/home-assistant-service.yaml rename to infrastructure/03-traefik/overlay-internal/foreign/home-assistant/home-assistant-service.yaml diff --git a/infrastructure/03-traefik/base/foreign/home-assistant/kustomization.yaml b/infrastructure/03-traefik/overlay-internal/foreign/home-assistant/kustomization.yaml similarity index 100% rename from infrastructure/03-traefik/base/foreign/home-assistant/kustomization.yaml rename to infrastructure/03-traefik/overlay-internal/foreign/home-assistant/kustomization.yaml diff --git a/infrastructure/03-traefik/base/foreign/kustomization.yaml b/infrastructure/03-traefik/overlay-internal/foreign/kustomization.yaml similarity index 100% rename from infrastructure/03-traefik/base/foreign/kustomization.yaml rename to infrastructure/03-traefik/overlay-internal/foreign/kustomization.yaml diff --git a/infrastructure/03-traefik/overlay-internal/kustomization.yaml b/infrastructure/03-traefik/overlay-internal/kustomization.yaml index 13d04ae..de88d4a 100644 --- a/infrastructure/03-traefik/overlay-internal/kustomization.yaml +++ b/infrastructure/03-traefik/overlay-internal/kustomization.yaml @@ -9,6 +9,7 @@ resources: #### OVERLAYS for internal traefik only ### Traefik base + - foreign - ../base - crds - traefik-namespace.yaml