From d296adcd657242aa40f6942c4af1907ea5c553d8 Mon Sep 17 00:00:00 2001
From: Samuel Liu <liupeng0518@gmail.com>
Date: Mon, 19 Jun 2023 10:18:20 +0800
Subject: [PATCH] allow change argocd url (#10176)
---
roles/kubernetes-apps/argocd/defaults/main.yml | 1 +
roles/kubernetes-apps/argocd/tasks/main.yml | 2 +-
roles/kubernetes-apps/argocd/templates/argocd-namespace.yml.j2 | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/roles/kubernetes-apps/argocd/defaults/main.yml b/roles/kubernetes-apps/argocd/defaults/main.yml
index 67f5851bf..9d6c38562 100644
--- a/roles/kubernetes-apps/argocd/defaults/main.yml
+++ b/roles/kubernetes-apps/argocd/defaults/main.yml
@@ -3,3 +3,4 @@ argocd_enabled: false
argocd_version: v2.6.7
argocd_namespace: argocd
# argocd_admin_password:
+argocd_install_url: "https://raw.githubusercontent.com/argoproj/argo-cd/{{ argocd_version }}/manifests/install.yaml"
diff --git a/roles/kubernetes-apps/argocd/tasks/main.yml b/roles/kubernetes-apps/argocd/tasks/main.yml
index 0ba8681ba..dd66d7375 100644
--- a/roles/kubernetes-apps/argocd/tasks/main.yml
+++ b/roles/kubernetes-apps/argocd/tasks/main.yml
@@ -22,7 +22,7 @@
- name: install
file: argocd-install.yml
namespace: "{{ argocd_namespace }}"
- url: "https://raw.githubusercontent.com/argoproj/argo-cd/{{ argocd_version }}/manifests/install.yaml"
+ url: "{{ argocd_install_url }}"
when:
- "inventory_hostname == groups['kube_control_plane'][0]"
diff --git a/roles/kubernetes-apps/argocd/templates/argocd-namespace.yml.j2 b/roles/kubernetes-apps/argocd/templates/argocd-namespace.yml.j2
index 99962f13f..5a3d40f8a 100644
--- a/roles/kubernetes-apps/argocd/templates/argocd-namespace.yml.j2
+++ b/roles/kubernetes-apps/argocd/templates/argocd-namespace.yml.j2
@@ -2,6 +2,6 @@
apiVersion: v1
kind: Namespace
metadata:
- name: {{argocd_namespace}}
+ name: {{ argocd_namespace }}
labels:
app: argocd
--
GitLab