Skip to content

Commit d6880fe

Browse files
stephencsheltonaduth
authored andcommitted
Adding an info and label with some tracing info to the ArgoCD Application
* Changing this to match merge request format * Adding in missing sed commands * Adding an info and label with some tracing info to the ArgoCD Application See merge request lg/identity-pki!31
1 parent 50f6204 commit d6880fe

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,9 @@ review-app:
317317
- sed -i "s|{{DASHBOARD_CONTAINER_TAG}}|${DASHBOARD_IMAGE_TAG}|g" ${APPLICATION_MANIFEST}
318318
- sed -i "s|{{PIVCAC_CONTAINER_TAG}}|${CI_COMMIT_SHA}|g" ${APPLICATION_MANIFEST}
319319
- sed -i "s|{{ECR_REGISTRY}}|${ECR_REGISTRY}|g" ${APPLICATION_MANIFEST}
320+
- sed -i "s|{{CI_MERGE_REQUEST_SOURCE_PROJECT_URL}}|${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}|g" ${APPLICATION_MANIFEST}
321+
- sed -i "s|{{CI_PROJECT_NAME}}|${CI_PROJECT_NAME}|g" ${APPLICATION_MANIFEST}
322+
- sed -i "s|{{CI_MERGE_REQUEST_IID}}|${CI_MERGE_REQUEST_IID}|g" ${APPLICATION_MANIFEST}
320323
- cat ${APPLICATION_MANIFEST}
321324
# Apply our ArgoCD Application
322325
- kubectl apply -f ${APPLICATION_MANIFEST} -n argocd

k8files/application.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ metadata:
44
name: {{ENVIRONMENT}}
55
finalizers:
66
- resources-finalizer.argocd.argoproj.io
7+
labels:
8+
project-name: {{CI_PROJECT_NAME}}
79
spec:
810
project: default
911
source:
@@ -562,4 +564,7 @@ spec:
562564
prune: true
563565
selfHeal: true
564566
syncOptions:
565-
- CreateNamespace=true
567+
- CreateNamespace=true
568+
info:
569+
- name: Merge Request
570+
value: {{CI_MERGE_REQUEST_SOURCE_PROJECT_URL}}/-/merge_requests/{{CI_MERGE_REQUEST_IID}}

0 commit comments

Comments
 (0)