Try out the Helm chart for ArgoCD

4 files changed, 25 insertions, 47 deletions

diff --git a/playbooks.d/k3s-master/playbook.bash b/playbooks.d/k3s-master/playbook.bash
index 0b5f5f3..01e051f 100644
--- a/playbooks.d/k3s-master/playbook.bash
+++ b/playbooks.d/k3s-master/playbook.bash
@@ -20,18 +20,22 @@ playbook_add() {
 	info "$BASHTARD_PLAYBOOK" "Installing k3s"
 	curl -sfL https://get.k3s.io | sh -  # I hate this
 
+	export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
+	export HELM_KUBECONTEXT=default
+
 	info "$BASHTARD_PLAYBOOK" "Installing ArgoCD on k3s"
 	k3s kubectl create namespace argocd
-	k3s kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
+	helm repo add argo https://argoproj.github.io/argo-helm
+	helm install \
+		-n argocd \
+		-f "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/argocd/values.yaml" \
+		argocd argo/argo-cd
 }
 
 playbook_sync() {
 	info "$BASHTARD_PLAYBOOK" "Applying system manifests"
 	k3s kubectl apply -Rf "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/system"
 
-	info "$BASHTARD_PLAYBOOK" "Applying argocd manifests"
-	k3s kubectl apply -Rf "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/argocd"
-
 	info "$BASHTARD_PLAYBOOK" "Applying app manifests"
 	k3s kubectl apply -R -n argocd -f "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/apps"
 }
diff --git a/playbooks.d/k3s-master/share/argocd/argocd-cm.yaml b/playbooks.d/k3s-master/share/argocd/argocd-cm.yaml
deleted file mode 100644
index cdaaadc..0000000
--- a/playbooks.d/k3s-master/share/argocd/argocd-cm.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: argocd-cm
-  namespace: argocd
-  labels:
-    app.kubernetes.io/part-of: argocd
-data:
-  url: argo.tyil.nl
-  users.anonymous.enabled: true
-...
diff --git a/playbooks.d/k3s-master/share/argocd/ingress.yaml b/playbooks.d/k3s-master/share/argocd/ingress.yaml
deleted file mode 100644
index d3553e7..0000000
--- a/playbooks.d/k3s-master/share/argocd/ingress.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: argocd-server-ingress
-  namespace: argocd
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/ingress.class: nginx
-    kubernetes.io/tls-acme: "true"
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-    # If you encounter a redirect loop or are getting a 307 response code
-    # then you need to force the nginx ingress to connect to the backend using HTTPS.
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
-spec:
-  rules:
-  - host: argo.tyil.nl
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: argocd-server
-            port:
-              name: https
-  tls:
-  - hosts:
-    - argo.tyil.nl
-    secretName: argocd-secret # do not change, this is provided by Argo CD
-...
diff --git a/playbooks.d/k3s-master/share/argocd/values.yaml b/playbooks.d/k3s-master/share/argocd/values.yaml
new file mode 100644
index 0000000..1acf734
--- /dev/null
+++ b/playbooks.d/k3s-master/share/argocd/values.yaml
@@ -0,0 +1,17 @@
+---
+server:
+  ingress:
+    enabled: true
+    ingressClassName: nginx
+    hosts:
+    - argocd.tyil.nl
+repoServer:
+  volumeMounts:
+  - name: helm-secret-values
+    mountPath: /opt/helm-secret-values
+  volumes:
+  - name: helm-secret-values
+    secret:
+      secretName: helm-secret-values
+      optional: true
+...