From 78e576ded755f8c54cf590dcf7a789256b44f839 Mon Sep 17 00:00:00 2001 From: Said Sef Date: Sun, 5 Feb 2023 15:30:17 +0000 Subject: [PATCH] Added ArgoCD Application TrackingID annotation (#82) --- charts/applicationset/Chart.yaml | 6 ++---- charts/applicationset/README.md | 2 +- charts/applicationset/templates/github-pr.yml | 3 ++- charts/applicationset/templates/gitlab-pr.yml | 3 ++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/applicationset/Chart.yaml b/charts/applicationset/Chart.yaml index f267b21..9eef990 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 for Kubernetes type: application -version: &version "0.8.9" +version: &version "0.8.10" appVersion: *version kubeVersion: ">= 1.23" home: https://github.com/saidsef/argocd-applicationsets-services @@ -23,9 +23,7 @@ annotations: artifacthub.io/license: "Apache-2.0" artifacthub.io/changes: | - kind: added - description: Added allowed resources that can be deployed in namespaces - - kind: fixed - description: Fixed typo in GitHub PR URL + description: Added ArgoCD Application TrackingID annotation 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 5b04421..6d65adc 100644 --- a/charts/applicationset/README.md +++ b/charts/applicationset/README.md @@ -1,6 +1,6 @@ # argocd-applicationsets-services -![Version: 0.8.9](https://img.shields.io/badge/Version-0.8.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.9](https://img.shields.io/badge/AppVersion-0.8.9-informational?style=flat-square) +![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.10](https://img.shields.io/badge/AppVersion-0.8.10-informational?style=flat-square) A HELM Chart for ArgoCD ApplicationSets for Kubernetes diff --git a/charts/applicationset/templates/github-pr.yml b/charts/applicationset/templates/github-pr.yml index e39fcf5..a89581f 100644 --- a/charts/applicationset/templates/github-pr.yml +++ b/charts/applicationset/templates/github-pr.yml @@ -53,12 +53,13 @@ spec: argocd-image-updater.argoproj.io/write-back-method: 'argocd' argocd.argoproj.io/application-set-refresh: "true" argocd.argoproj.io/head: '{{ $dqf }}head_short_sha{{ $dqb }}' + argocd.argoproj.io/tracking-id: '{{$repo.name}}:{{ $dqf }}head_short_sha{{ $dqb }}' + link.argocd.argoproj.io/external-link: '{{ $pr }}/{{ $github.owner }}/{{or $repo.name $repo.path}}/pull/{{ $dqf }}number{{ $dqb }}' notifications.argoproj.io/subscribe.on-deleted.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-deployed.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-health-degraded.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-sync-failed.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-sync-running.slack: '{{ $notificationChannel }}' - link.argocd.argoproj.io/external-link: "{{ $pr }}/{{ $github.owner }}/{{or $repo.name $repo.path}}/pull/{{ $dqf }}number{{ $dqb }}" spec: source: {{- $localRepoUrl := printf "https://github.com/%s/%s.git" $github.owner $repo.name }} diff --git a/charts/applicationset/templates/gitlab-pr.yml b/charts/applicationset/templates/gitlab-pr.yml index 6232c01..551c31d 100644 --- a/charts/applicationset/templates/gitlab-pr.yml +++ b/charts/applicationset/templates/gitlab-pr.yml @@ -52,12 +52,13 @@ spec: argocd-image-updater.argoproj.io/write-back-method: 'argocd' argocd.argoproj.io/application-set-refresh: "true" argocd.argoproj.io/head: '{{ $dqf }}head_short_sha{{ $dqb }}' + argocd.argoproj.io/tracking-id: '{{$repo.name}}:{{ $dqf }}head_short_sha{{ $dqb }}' + link.argocd.argoproj.io/external-link: '{{ $gitlab.api }}/{{ $gitlab.group }}/{{or $repo.name $repo.path}}/-/merge_requests/{{ $dqf }}number{{ $dqb }}' notifications.argoproj.io/subscribe.on-deleted.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-deployed.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-health-degraded.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-sync-failed.slack: '{{ $notificationChannel }}' notifications.argoproj.io/subscribe.on-sync-running.slack: '{{ $notificationChannel }}' - link.argocd.argoproj.io/external-link: "{{ $gitlab.api }}/{{ $gitlab.group }}/{{or $repo.name $repo.path}}/-/merge_requests/{{ $dqf }}number{{ $dqb }}" spec: source: {{- $localRepoUrl := printf "https://gitlab.com/%s/%s.git" $gitlab.group $repo.name }}