Fix secret name, add cloudflared to configuration

ProfMoo · Sep 29, 2024 · 864186d · 864186d
1 parent ea4bb09
commit 864186d
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 11 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,6 +10,7 @@
         "buildarr",
         "buroa",
         "Ceph",
+        "cloudflared",
         "coredns",
         "crds",
         "customresourcedefinitions",

diff --git a/kubernetes/homelab/apps/cert-manager/cert-manager/issuers/external-secret.yaml b/kubernetes/homelab/apps/cert-manager/cert-manager/issuers/external-secret.yaml
@@ -3,10 +3,10 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: external-dns-cloudflare
+  name: cloudflare-secret
 spec:
   target:
-    name: external-dns-cloudflare-secret
+    name: cloudflare-secret
     template:
       engineVersion: v2
       data:

diff --git a/...tworking/cloudflared/app/dnsendpoint.yaml → ...working/cloudflared/app/dns-endpoint.yaml b/...tworking/cloudflared/app/dnsendpoint.yaml → ...working/cloudflared/app/dns-endpoint.yaml
diff --git a/...rking/cloudflared/app/externalsecret.yaml → ...king/cloudflared/app/external-secret.yaml b/...rking/cloudflared/app/externalsecret.yaml → ...king/cloudflared/app/external-secret.yaml
@@ -5,9 +5,6 @@ kind: ExternalSecret
 metadata:
   name: cloudflared-tunnel
 spec:
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: onepassword-connect
   target:
     name: cloudflared-tunnel-secret
     template:
@@ -19,6 +16,20 @@ spec:
             "TunnelSecret": "{{ .CLOUDFLARE_TUNNEL_SECRET }}",
             "TunnelID": "${CLUSTER_CLOUDFLARE_TUNNEL_ID}"
           }
-  dataFrom:
-    - extract:
-        key: cloudflare
+data:
+  - secretKey: EMAIL
+    sourceRef:
+      storeRef:
+        name: bitwarden-fields
+        kind: ClusterSecretStore
+    remoteRef:
+      key: 0dd001ff-50e7-487e-a753-b1f9010310f5
+      property: EMAIL
+  - secretKey: API_KEY
+    sourceRef:
+      storeRef:
+        name: bitwarden-fields
+        kind: ClusterSecretStore
+    remoteRef:
+      key: 0dd001ff-50e7-487e-a753-b1f9010310f5
+      property: API_KEY
diff --git a/...tworking/cloudflared/app/helmrelease.yaml → ...working/cloudflared/app/helm-release.yaml b/...tworking/cloudflared/app/helmrelease.yaml → ...working/cloudflared/app/helm-release.yaml
diff --git a/kubernetes/homelab/apps/networking/cloudflared/app/kustomization.yaml b/kubernetes/homelab/apps/networking/cloudflared/app/kustomization.yaml
@@ -3,9 +3,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./externalsecret.yaml
-  - ./dnsendpoint.yaml
-  - ./helmrelease.yaml
+  - ./external-secret.yaml
+  - ./dns-endpoint.yaml
+  - ./helm-release.yaml
 configMapGenerator:
   - name: cloudflared-configmap
     files:

diff --git a/kubernetes/homelab/apps/networking/external-dns/ks.yaml b/kubernetes/homelab/apps/networking/external-dns/ks.yaml
@@ -23,3 +23,24 @@ spec:
     provider: sops
     secretRef:
       name: sops-age
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app external-dns-cloudflare
+  namespace: flux-system
+spec:
+  targetNamespace: networking
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  path: ./kubernetes/homelab/apps/networking/external-dns/unifi
+  prune: false
+  sourceRef:
+    kind: GitRepository
+    name: profmoo-home
+  wait: true
+  interval: 30m
+  retryInterval: 1m
+  timeout: 15m
diff --git a/kubernetes/homelab/apps/networking/kustomization.yaml b/kubernetes/homelab/apps/networking/kustomization.yaml
@@ -6,3 +6,4 @@ resources:
   - ./namespace.yaml
   - ./nginx/ks.yaml
   - ./external-dns/ks.yaml
+  - ./cloudflared/ks.yaml