From e90a9f0fdfffba1f7b997bea4231ea317f628c47 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 2 Nov 2023 07:58:04 +0100 Subject: [PATCH] Added argocd wrapper chart to include global configuration of argocd --- helm/argocd/Chart.lock | 6 ++++++ helm/argocd/Chart.yaml | 8 ++++++++ {k8s => helm/argocd/templates}/app-of-apps.yaml | 0 .../argocd/templates}/argocd-ingress.yaml | 2 +- helm/argocd/values-ha.yaml | 15 +++++++++++++++ helm/argocd/values-single.yaml | 0 helm/argocd/values.yaml | 1 + 7 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 helm/argocd/Chart.lock create mode 100644 helm/argocd/Chart.yaml rename {k8s => helm/argocd/templates}/app-of-apps.yaml (100%) rename {k8s => helm/argocd/templates}/argocd-ingress.yaml (93%) create mode 100644 helm/argocd/values-ha.yaml create mode 100644 helm/argocd/values-single.yaml create mode 100644 helm/argocd/values.yaml diff --git a/helm/argocd/Chart.lock b/helm/argocd/Chart.lock new file mode 100644 index 0000000..0f9dba3 --- /dev/null +++ b/helm/argocd/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: argo-cd + repository: https://argoproj.github.io/argo-helm + version: 4.7.0 +digest: sha256:d8223fd35aa43c41982fb7297275742f70a79c577eef667b1d928bcdb036f3df +generated: "2023-11-02T07:54:46.720255+01:00" diff --git a/helm/argocd/Chart.yaml b/helm/argocd/Chart.yaml new file mode 100644 index 0000000..259204a --- /dev/null +++ b/helm/argocd/Chart.yaml @@ -0,0 +1,8 @@ +apiVersion: v2 +name: argocd +version: 0.1.0 +type: application +dependencies: + - name: argo-cd + version: 4.7.0 + repository: https://argoproj.github.io/argo-helm \ No newline at end of file diff --git a/k8s/app-of-apps.yaml b/helm/argocd/templates/app-of-apps.yaml similarity index 100% rename from k8s/app-of-apps.yaml rename to helm/argocd/templates/app-of-apps.yaml diff --git a/k8s/argocd-ingress.yaml b/helm/argocd/templates/argocd-ingress.yaml similarity index 93% rename from k8s/argocd-ingress.yaml rename to helm/argocd/templates/argocd-ingress.yaml index 371c728..de73e18 100644 --- a/k8s/argocd-ingress.yaml +++ b/helm/argocd/templates/argocd-ingress.yaml @@ -26,5 +26,5 @@ spec: name: https tls: - hosts: - - argocd.2martens.de + - argocd.k8s.{{ .Values.environment }}.2martens.de secretName: argocd-server-tls # as expected by argocd-server \ No newline at end of file diff --git a/helm/argocd/values-ha.yaml b/helm/argocd/values-ha.yaml new file mode 100644 index 0000000..5753d82 --- /dev/null +++ b/helm/argocd/values-ha.yaml @@ -0,0 +1,15 @@ +argo-cd: + redis-ha: + enabled: true + + controller: + replicas: 1 + + server: + replicas: 2 + + repoServer: + replicas: 2 + + applicationSet: + replicas: 2 \ No newline at end of file diff --git a/helm/argocd/values-single.yaml b/helm/argocd/values-single.yaml new file mode 100644 index 0000000..e69de29 diff --git a/helm/argocd/values.yaml b/helm/argocd/values.yaml new file mode 100644 index 0000000..6a8905d --- /dev/null +++ b/helm/argocd/values.yaml @@ -0,0 +1 @@ +environment: test \ No newline at end of file