chore(app/name): Include repo name in the PR/MR application name (#136)

saidsef · Dec 1, 2023 · 31ffbf7 · 31ffbf7
1 parent 679a364
commit 31ffbf7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 "-" }}