From d09fbf076b003bf9eb0804e8f991c084b75e2248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Thu, 25 Apr 2024 21:22:18 +0200 Subject: [PATCH] fix --- share/gitea-tekton-org/listener.tf | 12 +++++++++++- .../v1_ConfigMap_auto-cd-templates.yaml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/share/gitea-tekton-org/listener.tf b/share/gitea-tekton-org/listener.tf index 23d1d24..5bb93f3 100644 --- a/share/gitea-tekton-org/listener.tf +++ b/share/gitea-tekton-org/listener.tf @@ -32,10 +32,20 @@ resource "kubectl_manifest" "el" { params: - name: "overlays" value: + - key: artifactory-url + expression: "body.repository.clone_url.split('/')[2]" - key: deploy-url expression: "body.repository.ssh_url.replace([body.repository.name,'.git'].join(), 'deploy.git')" + - key: project-name + expression: "body.repository.name" + - key: project-path + expression: "body.repository.full_name" + - key: git-repository-url + expression: "body.repository.ssh_url" + - key: git-default-branch + expression: "body.repository.default_branch" - key: generate-name - expression: "'add-'+body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()" + expression: "'delete-'+body.repository.name.replace('_','-').replace('/','-').replace(':','-').lowerAscii()" triggerSelector: labelSelector: matchLabels: 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 0d3e18f..8df0cc7 100644 --- a/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml +++ b/share/gitea-tekton-org/v1_ConfigMap_auto-cd-templates.yaml @@ -47,7 +47,7 @@ data: git_prepare() { local url="$1" username="$2" email="$3" mkdir -p "${HOME}/.ssh" - cp -v "${WORKSPACE_SSH_DIRECTORY_PATH}"/* "${HOME}/.ssh" + cp "${WORKSPACE_SSH_DIRECTORY_PATH}"/* "${HOME}/.ssh" chmod 700 "${HOME}/.ssh" chmod 400 "${HOME}/.ssh"/* git config --global user.name "$username"