Merge pull request #39 from cloud-pi-native/feat/app-repo-name

feat: ✨ calculate app name from repo url
cloud-pi-native · Jul 15, 2024 · 30f552a · 30f552a
2 parents a307e07 + 509dc7a
commit 30f552a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/charts/dso-env/Chart.yaml b/charts/dso-env/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: dso-env
 description: Creates argocd Project and Applications to deploy DSO project repositories.
 type: application
-version: 1.2.0
+version: 1.2.1
 appVersion: 1.0.0
 maintainers:
   - name: this-is-tobi

diff --git a/charts/dso-env/README.md b/charts/dso-env/README.md
@@ -1,6 +1,6 @@
 # dso-env
 
-![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 Creates argocd Project and Applications to deploy DSO project repositories.
 
@@ -16,7 +16,7 @@ Creates argocd Project and Applications to deploy DSO project repositories.
 |-----|------|---------|-------------|
 | application.destination.name | string | `"dest"` | Nom du cluster applicatif cible |
 | application.destination.namespace | string | `"app1"` | Nom du namespace applicatif cible |
-| application.repositories | list | `[{"name":"quota-explorer","path":".","repoURL":"https://gitlab.com/projects/org/demo/quota-explorer.git","targetRevision":"main"}]` | Liste des dépôts à déployer |
+| application.repositories | list | `[{"path":".","repoURL":"https://gitlab.com/projects/org/demo/quota-explorer.git","targetRevision":"main"}]` | Liste des dépôts à déployer |
 | application.sourceReposPrefix | string | `"https://gitlab.com/projects/org/demo"` | Préfixe des dépôts autorisés |
 | argocd.namespace | string | `"argocd"` | Namespace de création des objets ArgoCD |
 | argocd.nsChartVersion | string | `"1.0.0"` | Version du Chart dso-ns à utiliser |

diff --git a/charts/dso-env/templates/application-app.yaml b/charts/dso-env/templates/application-app.yaml
@@ -3,7 +3,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: {{ $.Values.argocd.project }}-app-{{ .name }}
+  name: {{ $.Values.argocd.project }}-{{ base .repoURL | trimSuffix ".git" }}-{{ sha1sum .repoURL | trunc 4 }}
   namespace: {{ $.Values.argocd.namespace }}
   labels:
     app.kubernetes.io/managed-by: dso-console

diff --git a/charts/dso-env/values.yaml b/charts/dso-env/values.yaml
@@ -28,7 +28,6 @@ application:
     namespace: app1
   # -- Liste des dépôts à déployer
   repositories:
-  - name: quota-explorer
-    repoURL: https://gitlab.com/projects/org/demo/quota-explorer.git
+  - repoURL: https://gitlab.com/projects/org/demo/quota-explorer.git
     targetRevision: main
     path: '.'