Added helm chart ability to deploy cuncurrent pull requests (#102)

This will enable ArgoCD ApplicationSet name as suffix to GitHub and GitLab App names, and renamed GitLab file from pr to mr as suffix Other minor changes include: - Add platform annotations to services - Updated HELM chart keywords - Updated Chart annotation artifacthub changelog - Updated chart documentation - Update chart values example
saidsef · Apr 27, 2023 · 024954d · 024954d
1 parent 2f884a8
commit 024954d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 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 for Kubernetes
 type: application
-version: &version "0.9.1"
+version: &version "0.10.1"
 appVersion: *version
 kubeVersion: ">= 1.23"
 home: https://github.com/saidsef/argocd-applicationsets-services
@@ -11,9 +11,10 @@ keywords:
   - argoproj
   - argocd
   - gitops
+  - continuous deployment
   - applicationsets
-  - argocd-applicationsets
-  - preview-environment
+  - preview
+  - canary
 maintainers:
   - name: saidsef
     url: https://saidsef.github.io/argocd-applicationsets-services
@@ -23,13 +24,17 @@ annotations:
   artifacthub.io/license: "Apache-2.0"
   artifacthub.io/changes: |
     - kind: changed
-      description: Updated to add AppSet name as suffix to GitHub and GitLab App names
+      description: change ability to deploy services to different namespaces
     - kind: changed
-      description: Renamed GitLab file from pr to mr as suffix
+      description: change AppSet name to be included in service name - this allows multi-labeling
+    - kind: added
+      description: added artifacthub link to HELM documentation
   artifacthub.io/links: |
     - name: README
       url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/README.md
     - name: LICENSE
       url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/LICENSE.md
     - name: CONTRIBUTING
       url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/CONTRIBUTING.md
+    - name: HELM
+      url: https://raw.githubusercontent.com/saidsef/argocd-applicationsets-services/main/charts/applicationset/README.md
diff --git a/charts/applicationset/README.md b/charts/applicationset/README.md
@@ -1,6 +1,6 @@
 # argocd-applicationsets-services
 
-![Version: 0.8.20](https://img.shields.io/badge/Version-0.8.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.20](https://img.shields.io/badge/AppVersion-0.8.20-informational?style=flat-square)
+![Version: 0.10.1](https://img.shields.io/badge/Version-0.10.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.1](https://img.shields.io/badge/AppVersion-0.10.1-informational?style=flat-square)
 
 A HELM Chart for ArgoCD ApplicationSets for Kubernetes
 
@@ -24,8 +24,8 @@ Kubernetes: `>= 1.23`
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| github | object | `{"api":"https://api.github.com","label":"preview","owner":"saidsef","path":"deployment","secretKey":"","secretName":""}` | GitHub repo configuration parameters |
-| gitlab | object | `{"api":"https://gitlab.com","group":"saidsef","label":"preview","path":"deployment","secretKey":"","secretName":""}` | GitLab repo configuration parameters |
+| github | object | `{"api":"https://api.github.com","enabled":true,"label":"preview","owner":"saidsef","path":"deployment","secretKey":"","secretName":""}` | GitHub repo configuration parameters |
+| gitlab | object | `{"api":"https://gitlab.com","enabled":true,"group":"saidsef","label":"preview","path":"deployment","secretKey":"","secretName":""}` | GitLab repo configuration parameters |
 | globals | object | `{"deployToNamespace":"previews","label":"preview","notificationChannel":"argocd","requeueAfterSeconds":500,"retryBackoffDuration":"10s","revisionHistoryLimit":2,"server":"https://kubernetes.default.svc"}` | Global default variables |
 | globals.deployToNamespace | string | `"previews"` | Kubernetes namespace to deploy previews |
 | globals.label | string | `"preview"` | GitHub label to filter PRs that you want to target |

diff --git a/charts/applicationset/templates/github-pr.yml b/charts/applicationset/templates/github-pr.yml
@@ -23,6 +23,7 @@ metadata:
   namespace: {{ required "A valied namespace is required" $namespace | replace "." "-" }}
   labels:
     app.kubernetes.io/name: {{ $repo.name }}
+    app.kubernetes.io/platform: 'github'
   annotations:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     helm.sh/chart: '{{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}'
@@ -45,7 +46,7 @@ spec:
       requeueAfterSeconds: {{ $refresh | default 500 }}
   template:
     metadata:
-      name: {{ printf "pr-%sbranch_slug%s-%snumber%s" $dqf $dqb $dqf $dqb }}
+      name: {{ printf "pr-%sbranch_slug%s-%snumber%s-%s" $dqf $dqb $dqf $dqb $name }}
       labels:
         app.kubernetes.io/name: {{ $repo.name }}
         app.kubernetes.io/branch: {{ $branch }}
@@ -113,6 +114,6 @@ spec:
             duration: {{ $retryBackoffDuration }}
       destination:
         server: {{ $server }}
-        namespace: {{ coalesce $.Values.globals.deployToNamespace (printf "mr-%sbranch_slug%s-%snumber%s" $dqf $dqb $dqf $dqb) }}
+        namespace: {{ coalesce $repo.namespace $.Values.globals.deployToNamespace (printf "mr-%sbranch_slug%s-%snumber%s" $dqf $dqb $dqf $dqb) }}
 {{- end }}
 {{- end }}
diff --git a/charts/applicationset/templates/gitlab-mr.yml b/charts/applicationset/templates/gitlab-mr.yml
@@ -22,6 +22,7 @@ metadata:
   namespace: {{ required "A valied namespace is required" $namespace | replace "." "-" }}
   labels:
     app.kubernetes.io/name: {{ $repo.name }}
+    app.kubernetes.io/platform: 'gitlab'
   annotations:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     helm.sh/chart: '{{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}'
@@ -44,7 +45,7 @@ spec:
       requeueAfterSeconds: {{ $refresh | default 500 }}
   template:
     metadata:
-      name: {{ printf "mr-%sbranch_slug%s-%snumber%s" $dqf $dqb $dqf $dqb }}
+      name: {{ printf "mr-%sbranch_slug%s-%snumber%s-%s" $dqf $dqb $dqf $dqb $name }}
       labels:
         app.kubernetes.io/name: {{ $repo.name }}
         app.kubernetes.io/branch: {{ $branch }}
@@ -112,6 +113,6 @@ spec:
             duration: {{ $retryBackoffDuration }}
       destination:
         server: {{ $server }}
-        namespace: {{ coalesce $.Values.globals.deployToNamespace (printf "mr-%sbranch_slug%s-%snumber%s" $dqf $dqb $dqf $dqb) }}
+        namespace: {{ coalesce $repo.namespace $.Values.globals.deployToNamespace (printf "mr-%sbranch_slug%s-%snumber%s" $dqf $dqb $dqf $dqb) }}
 {{- end }}
 {{- end }}
diff --git a/charts/applicationset/values.yaml b/charts/applicationset/values.yaml
@@ -83,6 +83,7 @@ repos:
   # - name: service-a
   #   path: 'deployment/preview'
   #   project: 13
+  #   namespace: preview
   #   repoUrl: 'https://gitlab.com/project/service-a.git'
   github:
   - name: node-webserver