From a1f480d18c0a251fce3c043912936613f2544afe Mon Sep 17 00:00:00 2001
From: eding <edin.grech@gmail.com>
Date: Fri, 18 Sep 2026 21:15:15 +0200
Subject: [PATCH] fix: flatten generated runtime hosts

---
 .../templates/delivery-pipeline.yaml.tmpl     |  2 +-
 internal/bootstrap/bootstrap.go               | 43 +++++++++++--------
 internal/bootstrap/bootstrap_test.go          | 11 +++++
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/internal/assets/templates/delivery-pipeline.yaml.tmpl b/internal/assets/templates/delivery-pipeline.yaml.tmpl
index 3c2a86d..5cc8ffb 100644
--- a/internal/assets/templates/delivery-pipeline.yaml.tmpl
+++ b/internal/assets/templates/delivery-pipeline.yaml.tmpl
@@ -167,7 +167,7 @@ spec:
               repository: $IMAGE
               tag: $TAG
             gateway:
-              hostname: $APP_NAME-pr-$PR_NUMBER.{{ .ClusterDomain }}
+              hostname: $APP_NAME-pr-$PR_NUMBER{{ .RuntimeHostnameSuffix }}
         EOF
           cat > "$app_dir/kustomization.yaml" <<EOF
         apiVersion: kustomize.config.k8s.io/v1beta1
diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
index db2b52c..004bc7f 100644
--- a/internal/bootstrap/bootstrap.go
+++ b/internal/bootstrap/bootstrap.go
@@ -618,21 +618,22 @@ func canonicalForgejoOrigin(value string) (string, error) {
 }
 
 type appDeliveryTemplateConfig struct {
-	AppName              string
-	AppRepository        string
-	AppRepoURL           string
-	AppRepoRef           string
-	ProductionBranch     string
-	ImageRepository      string
-	BuildStrategy        string
-	BuildOutputDirectory string
-	BuildConfiguration   string
-	ForgejoBaseURL       string
-	ForgejoOwner         string
-	ManifestsURL         string
-	ManifestsRepo        string
-	ManifestsBranch      string
-	ClusterDomain        string
+	AppName               string
+	AppRepository         string
+	AppRepoURL            string
+	AppRepoRef            string
+	ProductionBranch      string
+	ImageRepository       string
+	BuildStrategy         string
+	BuildOutputDirectory  string
+	BuildConfiguration    string
+	ForgejoBaseURL        string
+	ForgejoOwner          string
+	ManifestsURL          string
+	ManifestsRepo         string
+	ManifestsBranch       string
+	ClusterDomain         string
+	RuntimeHostnameSuffix string
 }
 
 var deliveryAppName = regexp.MustCompile(`^[a-z0-9]([a-z0-9-]{0,45}[a-z0-9])?$`)
@@ -656,9 +657,9 @@ func renderAppDelivery(cfg config.Config) ([]byte, error) {
 		AppName: cfg.Delivery.AppName, AppRepository: appRepository, AppRepoURL: cfg.Delivery.AppRepoURL,
 		AppRepoRef: cfg.Delivery.AppRepoRef, ProductionBranch: cfg.Delivery.ProductionBranch, ImageRepository: cfg.Delivery.ImageRepository,
 		BuildStrategy: cfg.Delivery.BuildStrategy, BuildOutputDirectory: cfg.Delivery.BuildOutputDirectory, BuildConfiguration: cfg.Delivery.BuildConfiguration,
-		ForgejoBaseURL: origin, ForgejoOwner: cfg.Git.Owner, ManifestsURL: forgejo.CloneURL(origin, cfg.Git.Owner, cfg.Flux.ManifestsRepo), ManifestsRepo: cfg.Flux.ManifestsRepo, ManifestsBranch: cfg.Flux.Branch, ClusterDomain: cfg.Flux.ClusterDomain,
+		ForgejoBaseURL: origin, ForgejoOwner: cfg.Git.Owner, ManifestsURL: forgejo.CloneURL(origin, cfg.Git.Owner, cfg.Flux.ManifestsRepo), ManifestsRepo: cfg.Flux.ManifestsRepo, ManifestsBranch: cfg.Flux.Branch, ClusterDomain: cfg.Flux.ClusterDomain, RuntimeHostnameSuffix: deliveryRuntimeHostnameSuffix(cfg.Flux.ClusterDomain),
 	}
-	for name, value := range map[string]string{"appRepository": values.AppRepository, "appRepoUrl": values.AppRepoURL, "appRepoRef": values.AppRepoRef, "productionBranch": values.ProductionBranch, "imageRepository": values.ImageRepository, "buildOutputDirectory": values.BuildOutputDirectory, "buildConfiguration": values.BuildConfiguration, "forgejoBaseUrl": values.ForgejoBaseURL, "forgejoOwner": values.ForgejoOwner, "manifestsUrl": values.ManifestsURL, "manifestsRepo": values.ManifestsRepo, "manifestsBranch": values.ManifestsBranch, "clusterDomain": values.ClusterDomain} {
+	for name, value := range map[string]string{"appRepository": values.AppRepository, "appRepoUrl": values.AppRepoURL, "appRepoRef": values.AppRepoRef, "productionBranch": values.ProductionBranch, "imageRepository": values.ImageRepository, "buildOutputDirectory": values.BuildOutputDirectory, "buildConfiguration": values.BuildConfiguration, "forgejoBaseUrl": values.ForgejoBaseURL, "forgejoOwner": values.ForgejoOwner, "manifestsUrl": values.ManifestsURL, "manifestsRepo": values.ManifestsRepo, "manifestsBranch": values.ManifestsBranch, "clusterDomain": values.ClusterDomain, "runtimeHostnameSuffix": values.RuntimeHostnameSuffix} {
 		if value == "" || strings.ContainsAny(value, "\r\n") || config.RedactURL(value) != value {
 			return nil, fmt.Errorf("delivery %s cannot be empty or contain credentials", name)
 		}
@@ -674,6 +675,14 @@ func renderAppDelivery(cfg config.Config) ([]byte, error) {
 	return bytes.ReplaceAll(rendered.Bytes(), []byte("\r\n"), []byte("\n")), nil
 }
 
+func deliveryRuntimeHostnameSuffix(clusterDomain string) string {
+	labels := strings.Split(clusterDomain, ".")
+	if len(labels) < 3 {
+		return "." + clusterDomain
+	}
+	return "-" + strings.Join(labels[:len(labels)-2], "-") + "." + strings.Join(labels[len(labels)-2:], ".")
+}
+
 func deliveryRepository(baseURL, repositoryURL string) (string, error) {
 	base, err := canonicalForgejoOrigin(baseURL)
 	if err != nil {
diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go
index 3ccfa19..9f2e9d4 100644
--- a/internal/bootstrap/bootstrap_test.go
+++ b/internal/bootstrap/bootstrap_test.go
@@ -135,6 +135,17 @@ func TestGeneratedDeliveryUsesCombinedStaticBuildArtifactContract(t *testing.T)
 	}
 }
 
+func TestDeliveryRuntimeHostnameSuffix(t *testing.T) {
+	for domain, want := range map[string]string{
+		"example.test":   ".example.test",
+		"dev02.nid3.com": "-dev02.nid3.com",
+	} {
+		if got := deliveryRuntimeHostnameSuffix(domain); got != want {
+			t.Fatalf("deliveryRuntimeHostnameSuffix(%q) = %q, want %q", domain, got, want)
+		}
+	}
+}
+
 func TestGeneratedDeliveryUsesRuntimeImageWithoutStaticParameters(t *testing.T) {
 	cfg := config.Config{
 		Git:      config.GitConfig{BaseURL: "https://git.example.test", Owner: "platform"},
-- 
2.43.7