Enable persistence for workflows

4 files changed, 23 insertions, 9 deletions

diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/argo-workflows/helm-chart.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/argo-workflows/helm-chart.yaml
index 8597cdd..b7a7400 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/argo-workflows/helm-chart.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/argo-workflows/helm-chart.yaml
@@ -21,10 +21,23 @@ spec:
           name: garage-creds-argo
           key: secretKey
     controller:
+      persistence:
+        archive: true
+        postgresql:
+          host: 10.57.101.20
+          port: 5432
+          database: argo
+          tableName: argo_workflows
+          userNameSecret:
+            name: postgresql-creds-argo
+            key: username
+          passwordSecret:
+            name: postgresql-creds-argo
+            key: password
       workflowDefaults:
         spec:
           entrypoint: main
-          serviceAccountName: "argo-workflow"
+          serviceAccountName: "argo-runner"
           ttlStrategy:
             secondsAfterCompletion: 300
           podGC:
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/argo-events/rbac.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/rbac.yaml
index a646f66..e3b48c6 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/argo-events/rbac.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/rbac.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: argo-events-webhook
+  name: argo-runner
   namespace: cicd-system
 automountServiceAccountToken: true
 ...
@@ -10,12 +10,15 @@ automountServiceAccountToken: true
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: argo-events-webhook
+  name: argo-runner
+  namespace: cicd-system
 rules:
 - apiGroups:
   - ""
   resources:
   - secrets
+  - persistentvolumeclaims
+  - pods
   verbs:
   - get
   - list
@@ -84,14 +87,14 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: argo-events-webhook
+  name: argo-runner
   namespace: cicd-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: argo-events-webhook
+  name: argo-runner
 subjects:
 - kind: ServiceAccount
-  name: argo-events-webhook
+  name: argo-runner
   namespace: cicd-system
 ...
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/project-bashtard.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/project-bashtard.yaml
index 4f83959..8e77b3a 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/project-bashtard.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/project-bashtard.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: cicd-system
 spec:
   template:
-    serviceAccountName: argo-events-webhook
+    serviceAccountName: argo-runner
   dependencies:
   - name: webhook
     eventSourceName: webhook
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/project-bashtard.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/project-bashtard.yaml
index b59e5b7..0642028 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/project-bashtard.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/project-bashtard.yaml
@@ -5,8 +5,6 @@ metadata:
   name: project-bashtard
   namespace: cicd-system
 spec:
-  podGC:
-    deleteDelayDuration: 1h
   arguments:
     parameters:
     - name: ref