From a5792e551588239be25f90f27e1c8383c1ca1368 Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Fri, 31 Jan 2025 00:08:23 -0500
Subject: [PATCH] fix: remove email from config and cert manager (#1738)

---
 .github/tests/config-talos.yaml                                 | 1 -
 config.sample.yaml                                              | 2 --
 .../cert-manager/cert-manager/issuers/clusterissuers.yaml.j2    | 2 --
 .../kubernetes/flux/meta/settings/cluster-secrets.sops.yaml.j2  | 1 -
 4 files changed, 6 deletions(-)

diff --git a/.github/tests/config-talos.yaml b/.github/tests/config-talos.yaml
index 4dcb7dc4501..97295944b82 100644
--- a/.github/tests/config-talos.yaml
+++ b/.github/tests/config-talos.yaml
@@ -38,7 +38,6 @@ cloudflare:
   domain: fake
   token: take
   acme:
-    email: fake@example.com
     production: false
   tunnel:
     account_id: fake
diff --git a/config.sample.yaml b/config.sample.yaml
index 8c2e52e7cf9..a8df09b0275 100644
--- a/config.sample.yaml
+++ b/config.sample.yaml
@@ -106,8 +106,6 @@ cloudflare:
   token: ""
   # (REQUIRED) Optionals for Cloudflare Acme
   acme:
-    # (REQUIRED) Any email you want to be associated with the ACME account (used for TLS certs via letsencrypt.org)
-    email: ""
     # (REQUIRED) Use the ACME production server when requesting the wildcard certificate.
     #   By default the ACME staging server is used. This is to prevent being rate-limited.
     #   Update this option to `true` when you have verified the staging certificate
diff --git a/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/clusterissuers.yaml.j2 b/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/clusterissuers.yaml.j2
index bbee529b9f3..3157f384cd0 100644
--- a/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/clusterissuers.yaml.j2
+++ b/templates/config/kubernetes/apps/cert-manager/cert-manager/issuers/clusterissuers.yaml.j2
@@ -7,7 +7,6 @@ metadata:
 spec:
   acme:
     server: https://acme-v02.api.letsencrypt.org/directory
-    email: "${SECRET_ACME_EMAIL}"
     privateKeySecretRef:
       name: letsencrypt-production
     solvers:
@@ -28,7 +27,6 @@ metadata:
 spec:
   acme:
     server: https://acme-staging-v02.api.letsencrypt.org/directory
-    email: "${SECRET_ACME_EMAIL}"
     privateKeySecretRef:
       name: letsencrypt-staging
     solvers:
diff --git a/templates/config/kubernetes/flux/meta/settings/cluster-secrets.sops.yaml.j2 b/templates/config/kubernetes/flux/meta/settings/cluster-secrets.sops.yaml.j2
index ce2fc0c867c..ca84e478903 100644
--- a/templates/config/kubernetes/flux/meta/settings/cluster-secrets.sops.yaml.j2
+++ b/templates/config/kubernetes/flux/meta/settings/cluster-secrets.sops.yaml.j2
@@ -8,7 +8,6 @@ metadata:
 #% if cloudflare.enabled %#
 stringData:
   SECRET_DOMAIN: "#{ cloudflare.domain }#"
-  SECRET_ACME_EMAIL: "#{ cloudflare.acme.email }#"
   SECRET_CLOUDFLARE_TUNNEL_ID: "#{ cloudflare.tunnel.id }#"
 #% else %#
 stringData: {}