diff --git a/authority/pom.xml b/authority/pom.xml index 9e3010f..f1c2602 100644 --- a/authority/pom.xml +++ b/authority/pom.xml @@ -15,7 +15,7 @@ 0.0.1-SNAPSHOT pom authority-parent - Parent POM for the Prole authority modules + Parent POM for the Knoe authority modules 21 diff --git a/deploy.sh b/deploy.sh index d4bf8d2..dcd89de 100755 --- a/deploy.sh +++ b/deploy.sh @@ -51,6 +51,10 @@ def get_ip(host, ctx): if val: return val except: pass + # Public APP endpoints must be sourced from Ingress status + if host in ["api.knoe.dev", "git.knoe.dev", "svc.knoe.dev", "api.0.knoe.dev", "db.0.knoe.dev"]: + return "pending" + # Try Service fallback try: svcs = [] diff --git a/etc/init_service_layer.sh b/etc/init_service_layer.sh index b85a41d..91ddeca 100755 --- a/etc/init_service_layer.sh +++ b/etc/init_service_layer.sh @@ -4,7 +4,7 @@ set -euo pipefail # init_service_layer.sh # Purpose: -# - Deploy the Prole service layer (Garage, OpenBao, Kong; OpenTofu in non-k8s modes) +# - Deploy the service layer (Garage, OpenBao, Kong; OpenTofu in non-k8s modes) # - Keep service-layer resources grouped in SERVICE_NAMESPACE # - Migrate service layer to a new namespace diff --git a/knoe/core/milestones.py b/knoe/core/milestones.py index 2c1366e..df8735b 100644 --- a/knoe/core/milestones.py +++ b/knoe/core/milestones.py @@ -825,7 +825,7 @@ class DockerBuildMilestone(Milestone): return if progress: - progress("Building Prole database image...", 0.1) + progress("Building knoe-db database image...", 0.1) tag = state.controller.get_knoe_db_version() @@ -1427,14 +1427,14 @@ class InitializationScriptsMilestone(Milestone): class DeploymentMilestone(Milestone): def __init__(self): - super().__init__("deployment", "Prole Deployment") + super().__init__("deployment", "Knoe.dev Deployment") self.logger = logging.getLogger("DeploymentMilestone") def execute( self, state: InstallerState, progress: ProgressCallback | None = None ) -> None: if progress: - progress("Deploying Prole...", 0.3) + progress("Deploying Knoe.dev ...", 0.3) env = self._get_script_env(state) mode = env.get("PROLE_MODE", "") diff --git a/prole-auth/pom.xml b/prole-auth/pom.xml index f7afcfd..d8dd04d 100644 --- a/prole-auth/pom.xml +++ b/prole-auth/pom.xml @@ -14,7 +14,7 @@ prole-auth 0.0.1-SNAPSHOT prole-auth - Prole auth service (Kerberos/SPNEGO + session verify) + Knoe auth service (Kerberos/SPNEGO + session verify) 21 diff --git a/prole/deployment/README.md b/prole/deployment/README.md index 6e97f58..2cfebe5 100644 --- a/prole/deployment/README.md +++ b/prole/deployment/README.md @@ -1,4 +1,4 @@ -# Prole Deployment Git Source +# knoe.dev deployment Git Source This directory is a working tree for the OpenTofu k3s pipeline that mirrors the local k3d runtime. The `make init` target refreshes its contents from diff --git a/supabase/helm/render_supabase.py b/supabase/helm/render_supabase.py index 5a26600..c8f1cbb 100755 --- a/supabase/helm/render_supabase.py +++ b/supabase/helm/render_supabase.py @@ -868,20 +868,24 @@ def _build_overlay(cfg: configparser.ConfigParser, args: argparse.Namespace) -> }, "ingress": { "enabled": True, - "className": api_ingress_class, + **({"className": api_ingress_class} if mode != "k8s" else {}), "hosts": [{"host": host, "paths": [{"path": "/", "pathType": "Prefix"}]} for host in api_host_entries], + "annotations": { + **({"kubernetes.io/ingress.class": api_ingress_class} if mode == "k8s" else {}), + } }, "studioIngress": { "enabled": True, - "className": studio_ingress_class, + **({"className": studio_ingress_class} if mode != "k8s" else {}), "hosts": [{"host": host, "paths": [{"path": "/", "pathType": "Prefix"}]} for host in studio_host_entries], - **({ - "annotations": { + "annotations": { + **({"kubernetes.io/ingress.class": studio_ingress_class} if mode == "k8s" else {}), + **({ "nginx.ingress.kubernetes.io/auth-url": auth_verify_url, "nginx.ingress.kubernetes.io/auth-signin": auth_signin_url, "nginx.ingress.kubernetes.io/auth-response-headers": auth_response_headers, - } - } if frontdoor_auth_enabled else {}), + } if frontdoor_auth_enabled and mode != "k8s" else {}), + } }, }