From 94cc07bbb02b5626f64c978320b6eee511a95b96 Mon Sep 17 00:00:00 2001 From: CJ_Clippy Date: Fri, 28 Jun 2024 19:15:43 -0800 Subject: [PATCH] make traefik adoptable --- charts/fp/Chart.yaml | 2 +- charts/fp/templates/traefik.yaml | 8 +- .../controllers/external-dns.yaml.old | 79 ------------------- .../controllers/ingress-traefik.yaml | 1 + 4 files changed, 8 insertions(+), 82 deletions(-) delete mode 100644 infrastructure/controllers/external-dns.yaml.old diff --git a/charts/fp/Chart.yaml b/charts/fp/Chart.yaml index f2b0e39..772518b 100644 --- a/charts/fp/Chart.yaml +++ b/charts/fp/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: fp description: The Galaxy's Best VTuber Hentai Site -version: 0.0.8 +version: 0.0.9 keywords: - fp - futureporn diff --git a/charts/fp/templates/traefik.yaml b/charts/fp/templates/traefik.yaml index 1f4c59c..cf5fc5d 100644 --- a/charts/fp/templates/traefik.yaml +++ b/charts/fp/templates/traefik.yaml @@ -3,12 +3,16 @@ apiVersion: v1 kind: Service metadata: + name: traefik + namespace: futureporn annotations: {{ if eq .Values.environment "development" }} chisel-operator.io/exit-node-name: "traefik-exit-node" {{ end }} - name: traefik - namespace: futureporn + meta.helm.sh/release-name: fp + meta.helm.sh/release-namespace: futureporn + labels: + app.kubernetes.io/managed-by: Helm spec: ports: - name: web diff --git a/infrastructure/controllers/external-dns.yaml.old b/infrastructure/controllers/external-dns.yaml.old deleted file mode 100644 index 25cd728..0000000 --- a/infrastructure/controllers/external-dns.yaml.old +++ /dev/null @@ -1,79 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: external-dns - namespace: futureporn ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: external-dns -rules: -- apiGroups: [""] - resources: ["services","endpoints","pods"] - verbs: ["get","watch","list"] -- apiGroups: ["extensions","networking.k8s.io"] - resources: ["ingresses"] - verbs: ["get","watch","list"] -- apiGroups: [""] - resources: ["nodes"] - verbs: ["list"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: external-dns-viewer -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: external-dns -subjects: -- kind: ServiceAccount - name: external-dns - namespace: futureporn ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: external-dns - namespace: futureporn -spec: - strategy: - type: Recreate - selector: - matchLabels: - app: external-dns - template: - metadata: - labels: - app: external-dns - spec: - serviceAccountName: external-dns - containers: - - name: external-dns - resources: - limits: - memory: "1024Mi" - cpu: "100m" - image: registry.k8s.io/external-dns/external-dns:v0.14.1 - args: - - --source=service - - --source=ingress - - --provider=exoscale - - --domain-filter=sbtp.xyz - - --policy=sync # if you want DNS entries to get deleted as well - - --txt-owner-id=futureporn - - --exoscale-apizone=de-fra-1 - - --exoscale-apienv=api - env: - - name: EXTERNAL_DNS_EXOSCALE_APIKEY - valueFrom: - secretKeyRef: - name: exoscale - key: apiKey - - name: EXTERNAL_DNS_EXOSCALE_APISECRET - valueFrom: - secretKeyRef: - name: exoscale - key: apiSecret diff --git a/infrastructure/controllers/ingress-traefik.yaml b/infrastructure/controllers/ingress-traefik.yaml index fb1798a..cf23ef4 100644 --- a/infrastructure/controllers/ingress-traefik.yaml +++ b/infrastructure/controllers/ingress-traefik.yaml @@ -7,6 +7,7 @@ metadata: spec: interval: 24h url: https://traefik.github.io/charts + --- apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease