From b2dc02cf1c55b20088fa17b00942e657efb662ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Thu, 25 Apr 2024 11:37:33 +0200
Subject: [PATCH] fix

---
 share/gitea-tekton-org/datas.tf                          | 9 +++++++++
 .../tekton.dev_v1_Task_auto-cd-activate.yaml             | 4 ++++
 .../tekton.dev_v1_Task_auto-cd-create.yaml               | 4 ++++
 .../tekton.dev_v1_Task_auto-cd-delete.yaml               | 4 ++++
 .../gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml | 4 ++--
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/share/gitea-tekton-org/datas.tf b/share/gitea-tekton-org/datas.tf
index 09fa81f..a148dad 100644
--- a/share/gitea-tekton-org/datas.tf
+++ b/share/gitea-tekton-org/datas.tf
@@ -42,6 +42,9 @@ data "kustomization_overlay" "data" {
         value: ${var.domain_name}
       - op: add
         path: /spec/params/3/default
+        value: ${var.domain}
+      - op: add
+        path: /spec/params/4/default
         value: ${jsonencode(var.stages)}
     EOF
   }
@@ -59,6 +62,9 @@ data "kustomization_overlay" "data" {
         value: ${var.domain_name}
       - op: add
         path: /spec/params/3/default
+        value: ${var.domain}
+      - op: add
+        path: /spec/params/4/default
         value: ${jsonencode(var.stages)}
     EOF
   }
@@ -76,6 +82,9 @@ data "kustomization_overlay" "data" {
         value: ${var.domain_name}
       - op: add
         path: /spec/params/3/default
+        value: ${var.domain}
+      - op: add
+        path: /spec/params/4/default
         value: ${jsonencode(var.stages)}
     EOF
   }
diff --git a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-activate.yaml b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-activate.yaml
index 7e92011..ee521f3 100644
--- a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-activate.yaml
+++ b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-activate.yaml
@@ -13,6 +13,8 @@ spec:
       type: string
     - name: domain-name
       type: string
+    - name: domain
+      type: string
     - name: stages
       type: array
     - name: artifactory-url
@@ -34,6 +36,8 @@ spec:
       env:
       - name: ARTIFACTORY_URL
         value: $(params.artifactory-url)
+      - name: DOMAIN
+        value: $(params.domain)
       - name: DOMAIN_NAME
         value: $(params.domain-name)
       - name: ISSUER_NAME
diff --git a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-create.yaml b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-create.yaml
index 4a2baf2..c6b079b 100644
--- a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-create.yaml
+++ b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-create.yaml
@@ -13,6 +13,8 @@ spec:
       type: string
     - name: domain-name
       type: string
+    - name: domain
+      type: string
     - name: stages
       type: array
     - name: artifactory-url
@@ -34,6 +36,8 @@ spec:
       env:
       - name: ARTIFACTORY_URL
         value: $(params.artifactory-url)
+      - name: DOMAIN
+        value: $(params.domain)
       - name: DOMAIN_NAME
         value: $(params.domain-name)
       - name: ISSUER_NAME
diff --git a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-delete.yaml b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-delete.yaml
index 3d47b34..250ffd4 100644
--- a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-delete.yaml
+++ b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-cd-delete.yaml
@@ -13,6 +13,8 @@ spec:
       type: string
     - name: domain-name
       type: string
+    - name: domain
+      type: string
     - name: stages
       type: array
     - name: artifactory-url
@@ -34,6 +36,8 @@ spec:
       env:
       - name: ARTIFACTORY_URL
         value: $(params.artifactory-url)
+      - name: DOMAIN
+        value: $(params.domain)
       - name: DOMAIN_NAME
         value: $(params.domain-name)
       - name: ISSUER_NAME
diff --git a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
index 2e836d3..8313056 100644
--- a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
+++ b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
@@ -16,7 +16,7 @@ data:
     template() {
       local src=${TEMPLATE_ROOT}/$1 dest=$2
       if [ ! -f $dest ];then
-        envsubst '$ARTIFACTORY_URL,$DOMAIN_NAME,$ISSUER_NAME,$PROJECT_NAME,$PROJECT_PATH,$GIT_REPOSITORY_URL,$DEPLOY_URL,$STAGE,$ORG_NAME,$NAMESPACE' <"$src" >"$dest"
+        envsubst '$ARTIFACTORY_URL,$DOMAIN,$DOMAIN_NAME,$ISSUER_NAME,$PROJECT_NAME,$PROJECT_PATH,$GIT_REPOSITORY_URL,$DEPLOY_URL,$STAGE,$ORG_NAME,$NAMESPACE' <"$src" >"$dest"
         git add "$dest"
         added=$(($added+1))
       fi
@@ -213,7 +213,7 @@ data:
           name: install
         spec:
           path: "./stages/${STAGE}/${PROJECT_NAME}"
-          targetNamespace: "${DOMAIN_NAME}-org-${ORG_NAME}-${STAGE}"
+          targetNamespace: "${DOMAIN}-org-${ORG_NAME}-${STAGE}"
     - target:
         kind: ImageUpdateAutomation
         name: update