From 4743f11a22735725cad87dd7f7002884219deb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Wed, 24 Apr 2024 18:26:39 +0200
Subject: [PATCH] fix

---
 .../v1_ConfigMap_auto-cd-templates.yaml       | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

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 5b1acb7..b99077d 100644
--- a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
+++ b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml
@@ -34,11 +34,15 @@ data:
     del_resources() {
       local ress="$1" file="$2"
       yq -i 'del(.resources[]|select(.=="'"$ress"'"))' "$file"
+      git add "$file"
+      added=$(($added+1))
     }
     add_resources() {
       local ress="$1" file="$2"
       del_resources "$@"
       yq -i '.resources += "'"$ress"'"' "$file"
+      git add "$file"
+      added=$(($added+1))
     }
     git_prepare() {
       local url="$1" username="$2" email="$3"
@@ -56,6 +60,7 @@ data:
       copy empty-kusto.yaml "ci/kustomization.yaml"
       copy yamllint.yaml .yamllint.yaml
       copy base-repo.yaml bases/images/repo.yaml
+      copy images-kusto.yaml bases/images/kustomization.yaml
       copy base-cert.yaml bases/project/cert.yaml
       copy base-ingress.yaml bases/project/ingress.yaml
       copy base-policy.yaml bases/images/policy.yaml
@@ -88,9 +93,9 @@ data:
         mkdir -p "stages/${STAGE}/${PROJECT_NAME}" "stages/${STAGE}/deploy/${PROJECT_NAME}"
         template deploy-project-kusto.yaml.tmpl "stages/${STAGE}/deploy/${PROJECT_NAME}/kustomization.yaml"
         if [ "${STAGE}" == "prod" ||  "${STAGE}" == "production" ];then
-          copy deploy-policy-tag.yaml "stages/${STAGE}/policy.yaml"
+          copy deploy-policy-tag.yaml "stages/${STAGE}/deploy/${PROJECT_NAME}/policy.yaml"
         else
-          copy deploy-policy-default.yaml "stages/${STAGE}/policy.yaml"
+          copy deploy-policy-default.yaml "stages/${STAGE}/deploy/${PROJECT_NAME}/policy.yaml"
         fi
         copy empty-kusto.yaml "stages/${STAGE}/deploy/kustomization.yaml"
         template stage-kusto.yaml.tmpl "stages/${STAGE}/${PROJECT_NAME}/kustomization.yaml"
@@ -131,7 +136,7 @@ data:
         kind: Trigger
         name: push
       patch: |-
-        - op: modify
+        - op: replace
           path: /spec/template/spec/resourcetemplates/0/spec/pipelineRef/name
           value: auto-ci-push
     - target:
@@ -155,7 +160,7 @@ data:
         kind: Trigger
         name: push
       patch: |-
-        - op: modify
+        - op: replace
           path: /spec/template/spec/resourcetemplates/0/spec/pipelineRef/name
           value: auto-ci-tag
     - target:
@@ -198,7 +203,7 @@ data:
     - target:
         kind: ImagePolicy
         name: policy
-      patch: ../policy.yaml
+      path: policy.yaml
     - target:
         kind: ImageRepository
         name: repo
@@ -267,7 +272,6 @@ data:
   trigger-push.yaml: |-
     apiVersion: triggers.tekton.dev/v1beta1
     kind: Trigger
-    metadata:
     metadata:
       name: "push"
       labels:
@@ -457,6 +461,13 @@ data:
     apiVersion: kustomize.config.k8s.io/v1beta1
     kind: Kustomization
     resources:
+  images-kusto.yaml: |-
+    apiVersion: kustomize.config.k8s.io/v1beta1
+    kind: Kustomization
+    resources:
+    - policy.yaml
+    - repo.yaml
+    - update.yaml
   stage-kusto.yaml.tmpl: |-
     apiVersion: kustomize.config.k8s.io/v1beta1
     kind: Kustomization
@@ -468,15 +479,10 @@ data:
     - name: appli
       newName: ${ARTIFACTORY_URL}/${ORG_NAME}/${PROJECT_NAME}
       newTag: latest # {"$imagepolicy": "${NAMESPACE}:${PROJECT_NAME}-policy:tag"}
-    patches:
-    - target:
-        kind: ConfigMap
-        name: ${PROJECT_NAME}-config
-      patch: config.yaml
-    - target:
-        kind: Certificate
-        name: ${PROJECT_NAME}-web
-      patch: cert.yaml
+    patchesStrategicMerge:
+    - config.yaml
+    - cert.yaml
+    patchesJson6902:
     - target:
         kind: Ingress
         name: ${PROJECT_NAME}-web
@@ -486,11 +492,11 @@ data:
       path: /spec/rules/O/host
       value: ${PROJECT_NAME}.${STAGE}.${ORG_NAME}.${DOMAIN_NAME}
     - op: add
-      path: /spec/tls/O
-      value:
-        secretName: ${PROJECT_NAME}-cert
-        hosts:
-        - "${PROJECT_NAME}.${STAGE}.${ORG_NAME}.${DOMAIN_NAME}"
+      path: /spec/rules/O/host
+      value: ${PROJECT_NAME}.${STAGE}.${ORG_NAME}.${DOMAIN_NAME}
+    - op: replace
+      path: /spec/tls/O/hosts/-
+      value: "${PROJECT_NAME}.${STAGE}.${ORG_NAME}.${DOMAIN_NAME}"
   stage-cert.yaml.tmpl: |-
     apiVersion: cert-manager.io/v1
     kind: Certificate
@@ -506,6 +512,7 @@ data:
     metadata:
       name: ${PROJECT_NAME}-config
     data:
+      ENV_VAR_NAME: env_var_value
   yamllint.yaml: |-
     ---
     extends: default
@@ -606,6 +613,9 @@ data:
     metadata:
       name: web
     spec:
+      tls:
+      - hosts: []
+        secretName: cert
       rules:
       - http:
           paths: