From ca2e083aeb20bbcd38d216aa3ce782c02bf93904 Mon Sep 17 00:00:00 2001 From: Vegard Hagen Date: Sun, 16 Oct 2022 19:51:32 +0200 Subject: [PATCH] chore(kustomize): Cleaning up resource definitions --- apps/arr/ingress.yaml | 1 - apps/arr/lidarr/deployment.yaml | 6 ------ apps/arr/lidarr/service.yaml | 1 - apps/arr/prowlarr/deployment.yaml | 6 ------ apps/arr/prowlarr/service.yaml | 1 - apps/arr/qbittorrent/deployment.yaml | 6 ------ apps/arr/qbittorrent/service.yaml | 1 - apps/arr/radarr/deployment.yaml | 6 ------ apps/arr/radarr/service.yaml | 1 - apps/arr/sonarr/deployment.yaml | 6 ------ apps/arr/sonarr/service.yaml | 1 - apps/arr/traefik-forward-auth/deployment.yaml | 5 ----- apps/arr/traefik-forward-auth/kustomization.yaml | 8 +------- apps/arr/traefik-forward-auth/service.yaml | 5 ----- apps/plex/deployment.yaml | 6 ------ apps/plex/ingress.yaml | 1 - apps/plex/kustomization.yaml | 6 +++--- apps/plex/namespace.yaml | 4 +--- apps/plex/service.yaml | 1 - .../traefik-forward-auth/kustomization.yaml | 8 +------- apps/traefik-forward-auth/whoami/deployment.yaml | 2 -- apps/traefik-forward-auth/whoami/ingress.yaml | 2 -- apps/traefik-forward-auth/whoami/service.yaml | 2 -- 23 files changed, 6 insertions(+), 80 deletions(-) diff --git a/apps/arr/ingress.yaml b/apps/arr/ingress.yaml index f3acda7..fab8c1f 100644 --- a/apps/arr/ingress.yaml +++ b/apps/arr/ingress.yaml @@ -1,7 +1,6 @@ apiVersion: traefik.containo.us/v1alpha1 kind: IngressRoute metadata: - namespace: arr name: ingressroute-arr spec: entryPoints: diff --git a/apps/arr/lidarr/deployment.yaml b/apps/arr/lidarr/deployment.yaml index 63d3af3..6cb50e8 100644 --- a/apps/arr/lidarr/deployment.yaml +++ b/apps/arr/lidarr/deployment.yaml @@ -1,19 +1,13 @@ kind: Deployment apiVersion: apps/v1 metadata: - namespace: arr name: lidarr - labels: - app: lidarr spec: replicas: 1 selector: matchLabels: app: lidarr template: - metadata: - labels: - app: lidarr spec: volumes: - name: lidarr-config diff --git a/apps/arr/lidarr/service.yaml b/apps/arr/lidarr/service.yaml index 4f5e8d9..e61cff2 100644 --- a/apps/arr/lidarr/service.yaml +++ b/apps/arr/lidarr/service.yaml @@ -1,7 +1,6 @@ apiVersion: v1 kind: Service metadata: - namespace: arr name: lidarr spec: type: LoadBalancer diff --git a/apps/arr/prowlarr/deployment.yaml b/apps/arr/prowlarr/deployment.yaml index 9efd2f9..e2214f1 100644 --- a/apps/arr/prowlarr/deployment.yaml +++ b/apps/arr/prowlarr/deployment.yaml @@ -1,19 +1,13 @@ kind: Deployment apiVersion: apps/v1 metadata: - namespace: arr name: prowlarr - labels: - app: prowlarr spec: replicas: 1 selector: matchLabels: app: prowlarr template: - metadata: - labels: - app: prowlarr spec: volumes: - name: prowlarr-config diff --git a/apps/arr/prowlarr/service.yaml b/apps/arr/prowlarr/service.yaml index bcbb8af..355290c 100644 --- a/apps/arr/prowlarr/service.yaml +++ b/apps/arr/prowlarr/service.yaml @@ -1,7 +1,6 @@ apiVersion: v1 kind: Service metadata: - namespace: arr name: prowlarr spec: type: LoadBalancer diff --git a/apps/arr/qbittorrent/deployment.yaml b/apps/arr/qbittorrent/deployment.yaml index 3a8d1eb..d274a80 100644 --- a/apps/arr/qbittorrent/deployment.yaml +++ b/apps/arr/qbittorrent/deployment.yaml @@ -1,19 +1,13 @@ kind: Deployment apiVersion: apps/v1 metadata: - namespace: arr name: qbittorrent - labels: - app: qbittorrent spec: replicas: 1 selector: matchLabels: app: qbittorrent template: - metadata: - labels: - app: qbittorrent spec: volumes: - name: qbittorrent-config diff --git a/apps/arr/qbittorrent/service.yaml b/apps/arr/qbittorrent/service.yaml index 0e8a31f..858b418 100644 --- a/apps/arr/qbittorrent/service.yaml +++ b/apps/arr/qbittorrent/service.yaml @@ -1,7 +1,6 @@ apiVersion: v1 kind: Service metadata: - namespace: arr name: qbittorrent spec: type: LoadBalancer diff --git a/apps/arr/radarr/deployment.yaml b/apps/arr/radarr/deployment.yaml index 089d2f8..89ee472 100644 --- a/apps/arr/radarr/deployment.yaml +++ b/apps/arr/radarr/deployment.yaml @@ -1,19 +1,13 @@ kind: Deployment apiVersion: apps/v1 metadata: - namespace: arr name: radarr - labels: - app: radarr spec: replicas: 1 selector: matchLabels: app: radarr template: - metadata: - labels: - app: radarr spec: volumes: - name: radarr-config diff --git a/apps/arr/radarr/service.yaml b/apps/arr/radarr/service.yaml index 7ab1d5e..7510cb5 100644 --- a/apps/arr/radarr/service.yaml +++ b/apps/arr/radarr/service.yaml @@ -1,7 +1,6 @@ apiVersion: v1 kind: Service metadata: - namespace: arr name: radarr spec: type: LoadBalancer diff --git a/apps/arr/sonarr/deployment.yaml b/apps/arr/sonarr/deployment.yaml index f46eedd..f606b36 100644 --- a/apps/arr/sonarr/deployment.yaml +++ b/apps/arr/sonarr/deployment.yaml @@ -1,19 +1,13 @@ kind: Deployment apiVersion: apps/v1 metadata: - namespace: arr name: sonarr - labels: - app: sonarr spec: replicas: 1 selector: matchLabels: app: sonarr template: - metadata: - labels: - app: sonarr spec: volumes: - name: sonarr-config diff --git a/apps/arr/sonarr/service.yaml b/apps/arr/sonarr/service.yaml index d522062..f288e59 100644 --- a/apps/arr/sonarr/service.yaml +++ b/apps/arr/sonarr/service.yaml @@ -1,7 +1,6 @@ apiVersion: v1 kind: Service metadata: - namespace: arr name: sonarr spec: type: LoadBalancer diff --git a/apps/arr/traefik-forward-auth/deployment.yaml b/apps/arr/traefik-forward-auth/deployment.yaml index 5f8e92c..e7d4e20 100644 --- a/apps/arr/traefik-forward-auth/deployment.yaml +++ b/apps/arr/traefik-forward-auth/deployment.yaml @@ -2,8 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: traefik-forward-auth - labels: - app: traefik-forward-auth spec: replicas: 1 selector: @@ -12,9 +10,6 @@ spec: strategy: type: Recreate template: - metadata: - labels: - app: traefik-forward-auth spec: terminationGracePeriodSeconds: 60 containers: diff --git a/apps/arr/traefik-forward-auth/kustomization.yaml b/apps/arr/traefik-forward-auth/kustomization.yaml index e1b2359..80eb41a 100644 --- a/apps/arr/traefik-forward-auth/kustomization.yaml +++ b/apps/arr/traefik-forward-auth/kustomization.yaml @@ -8,18 +8,12 @@ resources: - service.yaml - middleware.yaml -# -# Configs -# configMapGenerator: - name: configs files: - configs/traefik-forward-auth.ini -# -# Secrets -# secretGenerator: - name: traefik-forward-auth-secrets envs: - - secrets/traefik-forward-auth.env \ No newline at end of file + - secrets/traefik-forward-auth.env \ No newline at end of file diff --git a/apps/arr/traefik-forward-auth/service.yaml b/apps/arr/traefik-forward-auth/service.yaml index 18dc8ea..569ceff 100644 --- a/apps/arr/traefik-forward-auth/service.yaml +++ b/apps/arr/traefik-forward-auth/service.yaml @@ -1,12 +1,7 @@ -# -# Auth Service -# apiVersion: v1 kind: Service metadata: name: traefik-forward-auth - labels: - app: traefik-forward-auth spec: type: ClusterIP selector: diff --git a/apps/plex/deployment.yaml b/apps/plex/deployment.yaml index 99a6503..6449cb6 100644 --- a/apps/plex/deployment.yaml +++ b/apps/plex/deployment.yaml @@ -1,19 +1,13 @@ kind: Deployment apiVersion: apps/v1 metadata: - namespace: plex name: plex - labels: - app: plex spec: replicas: 1 selector: matchLabels: app: plex template: - metadata: - labels: - app: plex spec: volumes: - name: plex-config diff --git a/apps/plex/ingress.yaml b/apps/plex/ingress.yaml index c264643..08b98d8 100644 --- a/apps/plex/ingress.yaml +++ b/apps/plex/ingress.yaml @@ -2,7 +2,6 @@ apiVersion: traefik.containo.us/v1alpha1 kind: IngressRoute metadata: name: ingressroute-plex - namespace: plex spec: entryPoints: - websecure diff --git a/apps/plex/kustomization.yaml b/apps/plex/kustomization.yaml index d335937..01cdf49 100644 --- a/apps/plex/kustomization.yaml +++ b/apps/plex/kustomization.yaml @@ -1,11 +1,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: arr +namespace: plex resources: - namespace.yaml -# - pv.yaml -# - pvc.yaml + # - pv.yaml + # - pvc.yaml - service.yaml - deployment.yaml - ingress.yaml diff --git a/apps/plex/namespace.yaml b/apps/plex/namespace.yaml index 0a7b854..10293c3 100644 --- a/apps/plex/namespace.yaml +++ b/apps/plex/namespace.yaml @@ -1,6 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: plex - labels: - name: plex \ No newline at end of file + name: plex \ No newline at end of file diff --git a/apps/plex/service.yaml b/apps/plex/service.yaml index 0ea169e..101f2a2 100644 --- a/apps/plex/service.yaml +++ b/apps/plex/service.yaml @@ -1,7 +1,6 @@ apiVersion: v1 kind: Service metadata: - namespace: plex name: plex spec: type: LoadBalancer diff --git a/apps/traefik-forward-auth/traefik-forward-auth/kustomization.yaml b/apps/traefik-forward-auth/traefik-forward-auth/kustomization.yaml index 29a5623..9a230a0 100644 --- a/apps/traefik-forward-auth/traefik-forward-auth/kustomization.yaml +++ b/apps/traefik-forward-auth/traefik-forward-auth/kustomization.yaml @@ -9,18 +9,12 @@ resources: - ingress.yaml - middleware.yaml -# -# Configs -# configMapGenerator: - name: configs files: - configs/traefik-forward-auth.ini -# -# Secrets -# secretGenerator: - name: traefik-forward-auth-secrets envs: - - secrets/traefik-forward-auth.env \ No newline at end of file + - secrets/traefik-forward-auth.env \ No newline at end of file diff --git a/apps/traefik-forward-auth/whoami/deployment.yaml b/apps/traefik-forward-auth/whoami/deployment.yaml index 9a7a762..85440bc 100644 --- a/apps/traefik-forward-auth/whoami/deployment.yaml +++ b/apps/traefik-forward-auth/whoami/deployment.yaml @@ -2,8 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: whoami - labels: - app: whoami spec: replicas: 1 selector: diff --git a/apps/traefik-forward-auth/whoami/ingress.yaml b/apps/traefik-forward-auth/whoami/ingress.yaml index 4f67231..d2de74e 100644 --- a/apps/traefik-forward-auth/whoami/ingress.yaml +++ b/apps/traefik-forward-auth/whoami/ingress.yaml @@ -2,8 +2,6 @@ apiVersion: traefik.containo.us/v1alpha1 kind: IngressRoute metadata: name: whoami - labels: - app: whoami spec: entryPoints: - websecure diff --git a/apps/traefik-forward-auth/whoami/service.yaml b/apps/traefik-forward-auth/whoami/service.yaml index 5e66115..b0f816f 100644 --- a/apps/traefik-forward-auth/whoami/service.yaml +++ b/apps/traefik-forward-auth/whoami/service.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: Service metadata: name: whoami - labels: - app: whoami spec: type: ClusterIP ports: