From 31ffbf7775e4fa3ac57f2597e02322622bb59b14 Mon Sep 17 00:00:00 2001
From: Said Sef <6002187+saidsef@users.noreply.github.com>
Date: Fri, 1 Dec 2023 10:49:20 +0000
Subject: [PATCH] chore(app/name): Include repo name in the PR/MR application
 name (#136)

---
 charts/applicationset/Chart.yaml              | 4 ++--
 charts/applicationset/README.md               | 2 +-
 charts/applicationset/templates/github-pr.yml | 2 +-
 charts/applicationset/templates/gitlab-mr.yml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/applicationset/Chart.yaml b/charts/applicationset/Chart.yaml
index 67d1947..b63561d 100644
--- a/charts/applicationset/Chart.yaml
+++ b/charts/applicationset/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-applicationsets-services
 description: A Helm chart for ArgoCD ApplicationSets, a declarative, GitOps continuous delivery tool for Kubernetes
 type: application
-version: &version "0.12.4"
+version: &version "0.12.5"
 appVersion: *version
 kubeVersion: ">= 1.23"
 home: https://github.com/saidsef/argocd-applicationsets-services
@@ -24,7 +24,7 @@ annotations:
   artifacthub.io/license: "Apache-2.0"
   artifacthub.io/changes: |
     - kind: changed
-      description: Replaced service name with head_short_sha_7 as part of the name
+      description: Include repo name in the PR/MR application name
   artifacthub.io/links: |
     - name: README
       url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/README.md
diff --git a/charts/applicationset/README.md b/charts/applicationset/README.md
index 745b15e..432f96b 100644
--- a/charts/applicationset/README.md
+++ b/charts/applicationset/README.md
@@ -1,6 +1,6 @@
 # argocd-applicationsets-services
 
-![Version: 0.12.4](https://img.shields.io/badge/Version-0.12.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.12.4](https://img.shields.io/badge/AppVersion-0.12.4-informational?style=flat-square)
+![Version: 0.12.5](https://img.shields.io/badge/Version-0.12.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.12.5](https://img.shields.io/badge/AppVersion-0.12.5-informational?style=flat-square)
 
 A Helm chart for ArgoCD ApplicationSets, a declarative, GitOps continuous delivery tool for Kubernetes
 
diff --git a/charts/applicationset/templates/github-pr.yml b/charts/applicationset/templates/github-pr.yml
index 2636df5..e200781 100644
--- a/charts/applicationset/templates/github-pr.yml
+++ b/charts/applicationset/templates/github-pr.yml
@@ -49,7 +49,7 @@ spec:
       requeueAfterSeconds: {{ $refresh | default 500 }}
   template:
     metadata:
-      name: {{ printf "pr-%shead_short_sha_7%s-%snumber%s-%s" $dqf $dqb $dqf $dqb $name }}
+      name: {{ printf "%s-%shead_short_sha_7%s-%snumber%s-%s" $repo.name $dqf $dqb $dqf $dqb $name }}
       labels:
         app.kubernetes.io/name: {{ $repo.name }}
         app.kubernetes.io/branch: {{ trunc 63 $branch | trimSuffix "-" }}
diff --git a/charts/applicationset/templates/gitlab-mr.yml b/charts/applicationset/templates/gitlab-mr.yml
index 8ca4d4b..8e3cca8 100644
--- a/charts/applicationset/templates/gitlab-mr.yml
+++ b/charts/applicationset/templates/gitlab-mr.yml
@@ -48,7 +48,7 @@ spec:
       requeueAfterSeconds: {{ $refresh | default 500 }}
   template:
     metadata:
-      name: {{ printf "mr-%sbranch_slug%s-%snumber%s-%s" $dqf $dqb $dqf $dqb $name | trunc 50 | trimSuffix "-" }}
+      name: {{ printf "%s-%sbranch_slug%s-%snumber%s-%s" $repo.name $dqf $dqb $dqf $dqb $name}}
       labels:
         app.kubernetes.io/name: {{ $repo.name }}
         app.kubernetes.io/branch: {{ trunc 63 $branch | trimSuffix "-" }}