From aa88adabc167e2aa54020f04f4a3c77f7dd9ad31 Mon Sep 17 00:00:00 2001 From: "A. F. Dudley" Date: Sun, 25 Jan 2026 17:35:53 -0500 Subject: [PATCH] feat(k8s): support acme-email config for Caddy ingress Adds support for configuring ACME email for Let's Encrypt certificates in kind deployments. The email can be specified in the spec under network.acme-email and will be used to configure the Caddy ingress controller ConfigMap. Co-Authored-By: Claude Opus 4.5 --- stack_orchestrator/deploy/k8s/deploy_k8s.py | 3 ++- stack_orchestrator/deploy/k8s/helpers.py | 17 ++++++++++++++++- stack_orchestrator/deploy/spec.py | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/stack_orchestrator/deploy/k8s/deploy_k8s.py b/stack_orchestrator/deploy/k8s/deploy_k8s.py index 3d0b697c..ed890595 100644 --- a/stack_orchestrator/deploy/k8s/deploy_k8s.py +++ b/stack_orchestrator/deploy/k8s/deploy_k8s.py @@ -301,7 +301,8 @@ class K8sDeployer(Deployer): self.connect_api() if self.is_kind() and not self.skip_cluster_management: # Configure ingress controller (not installed by default in kind) - install_ingress_for_kind() + acme_email = self.cluster_info.spec.get_acme_email() + install_ingress_for_kind(acme_email=acme_email) # Wait for ingress to start # (deployment provisioning will fail unless this is done) wait_for_ingress_in_kind() diff --git a/stack_orchestrator/deploy/k8s/helpers.py b/stack_orchestrator/deploy/k8s/helpers.py index a125d4f5..a0f378e0 100644 --- a/stack_orchestrator/deploy/k8s/helpers.py +++ b/stack_orchestrator/deploy/k8s/helpers.py @@ -90,7 +90,7 @@ def wait_for_ingress_in_kind(): error_exit("ERROR: Timed out waiting for Caddy ingress to become ready") -def install_ingress_for_kind(): +def install_ingress_for_kind(acme_email: str = ""): api_client = client.ApiClient() ingress_install = os.path.abspath( get_k8s_dir().joinpath( @@ -101,6 +101,21 @@ def install_ingress_for_kind(): print("Installing Caddy ingress controller in kind cluster") utils.create_from_yaml(api_client, yaml_file=ingress_install) + # Patch ConfigMap with ACME email if provided + if acme_email: + if opts.o.debug: + print(f"Configuring ACME email: {acme_email}") + core_api = client.CoreV1Api() + configmap = core_api.read_namespaced_config_map( + name="caddy-ingress-controller-configmap", namespace="caddy-system" + ) + configmap.data["email"] = acme_email + core_api.patch_namespaced_config_map( + name="caddy-ingress-controller-configmap", + namespace="caddy-system", + body=configmap, + ) + def load_images_into_kind(kind_cluster_name: str, image_set: Set[str]): for image in image_set: diff --git a/stack_orchestrator/deploy/spec.py b/stack_orchestrator/deploy/spec.py index 1713f28a..002288ff 100644 --- a/stack_orchestrator/deploy/spec.py +++ b/stack_orchestrator/deploy/spec.py @@ -117,6 +117,9 @@ class Spec: def get_http_proxy(self): return self.obj.get(constants.network_key, {}).get(constants.http_proxy_key, []) + def get_acme_email(self): + return self.obj.get(constants.network_key, {}).get("acme-email", "") + def get_annotations(self): return self.obj.get(constants.annotations_key, {})