Skip to content

Enhance argocd apps #1810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathieulaude merged 3 commits into from
Dec 12, 2025
Merged

Enhance argocd apps #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
638b399
refactor: :bookmark: add tracing information on Argo apps
mathieulaude Dec 12, 2025
89abfd8
feat: :sparkles: add environment name tag in helm values
mathieulaude Dec 12, 2025
ec06a4e
chore: :construction: make all new cluster external by default
mathieulaude Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/client/src/components/ClusterForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const props = withDefaults(defineProps<{
clusterResources: false,
privacy: ClusterPrivacy.DEDICATED,
infos: '',
external: false,
external: true,
id: '',
cpu: 0,
gpu: 0,
Expand Down Expand Up @@ -318,7 +318,7 @@ const isConnectionDetailsShown = ref(true)
v-model="localCluster.external"
value="localCluster.external"
label="Cluster externe"
hint="La console DSO n'essaiera pas de joindre l'API de ce cluster, le ArgoCD de la zone de chargera de configurer celui-ci."
hint="Activé par défaut pour un pilotage des déploiements par le ArgoCD de zone. À désactiver si la zone cible n'a pas encore migré vers ce mode de déploiement."
name="isExternalCluster"
/>
</template>
Expand Down
6 changes: 3 additions & 3 deletions apps/client/src/components/RepoForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ function toggleStandalone(e: boolean) {
data-testid="helmValuesFilesTextarea"
label="Fichiers values (Helm)"
label-visible
hint="Un fichier par ligne. Indiquer le chemin relatif par rapport au répertoire à déployer. L'ordre des fichiers est déterminant pour la surcharge des valeurs communes. Champ optionnel."
placeholder="values/prod.yaml
values/extra.yaml"
hint="Un fichier par ligne, chemin relatif par rapport au répertoire à déployer. La balise <env> sera remplacée par le nom de l'environnement. L'ordre des fichiers est déterminant pour la surcharge des valeurs communes. Champ optionnel."
placeholder="values/extra.yaml
values-<env>/custom.yaml"
@update:model-value="updateRepo('helmValuesFiles', $event)"
/>
</div>
Expand Down
5 changes: 4 additions & 1 deletion plugins/argocd/src/functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,14 @@ async function ensureInfraEnvValues(project: Project, environment: Environment,
const repositories: ArgoRepoSource[] = await Promise.all([
...infraRepositories.map(async (repository) => {
const repoURL = await gitlabApi.getPublicRepoUrl(repository.internalRepoName)
const valueFiles = repository.helmValuesFiles ? repository.helmValuesFiles.replaceAll('<env>', environment.name).split(',') : []
return {
id: repository.id,
name: repository.internalRepoName,
repoURL,
targetRevision: repository.deployRevision || 'HEAD',
path: repository.deployPath || '.',
valueFiles: repository.helmValuesFiles?.split(',') || [],
valueFiles,
}
}),
])
Expand Down
Loading