Update cicd-system manifests

6 files changed, 78 insertions, 11 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 b7a7400..7978820 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
@@ -15,11 +15,11 @@ spec:
         endpoint: 10.57.101.1:3900
         insecure: true
         accessKeySecret:
-          name: garage-creds-argo
-          key: accessKey
+          name: credentials
+          key: garageAccessKey
         secretKeySecret:
-          name: garage-creds-argo
-          key: secretKey
+          name: credentials
+          key: garageSecretKey
     controller:
       persistence:
         archive: true
@@ -29,11 +29,11 @@ spec:
           database: argo
           tableName: argo_workflows
           userNameSecret:
-            name: postgresql-creds-argo
-            key: username
+            name: credentials
+            key: postgresqlUsername
           passwordSecret:
-            name: postgresql-creds-argo
-            key: password
+            name: credentials
+            key: postgresqlPassword
       workflowDefaults:
         spec:
           entrypoint: main
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/rbac.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/rbac.yaml
index e3b48c6..ddca028 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/rbac.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/rbac.yaml
@@ -75,6 +75,7 @@ rules:
   - argoproj.io
   resources:
   - workflows
+  - workflowtaskresults
   verbs:
   - get
   - list
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/event-sources/webhook.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/event-sources/webhook.yaml
index 584b43d..1b901e0 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/event-sources/webhook.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/event-sources/webhook.yaml
@@ -10,6 +10,11 @@ spec:
     - port: 12000
       targetPort: 12000
   webhook:
+    default:
+      endpoint: /trigger
+      method: POST
+      port: "12000"
+      url: https://ci.tyil.nl
     generic-raku:
       endpoint: /trigger/generic-raku
       method: POST
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/default.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/default.yaml
new file mode 100644
index 0000000..b97239c
--- /dev/null
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/default.yaml
@@ -0,0 +1,61 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Sensor
+metadata:
+  name: default
+  namespace: cicd-system
+spec:
+  template:
+    serviceAccountName: argo-runner
+  dependencies:
+  - name: webhook
+    eventSourceName: webhook
+    eventName: generic
+  triggers:
+  - template:
+      name: webhook-workflow-trigger
+      k8s:
+        operation: create
+        source:
+          resource:
+            apiVersion: argoproj.io/v1alpha1
+            kind: Workflow
+            metadata:
+              generateName: generic
+            spec:
+              entrypoint: main
+              arguments:
+                parameters:
+                - name: ref
+                  value: ""
+                - name: repo
+                  value: ""
+              templates:
+              - name: main
+                inputs:
+                  parameters:
+                  - name: ref
+                    value: "{{workflows.parameters.ref}}"
+                steps:
+                - - name: main
+                    templateRef:
+                      name: generic
+                      template: main
+                    arguments:
+                      parameters:
+                      - name: ref
+                        value: "{{inputs.parameters.ref}}"
+                      - name: repo
+                        value: "{{inputs.parameters.repo}}"
+        parameters:
+        - src:
+            dependencyName: webhook
+            dataKey: body.commit
+            value: "origin/master"
+          dest: spec.arguments.parameters.0.value
+        - src:
+            dependencyName: "webhook"
+            dataKey: body.repo
+            value: ""
+          dest: spec.arguments.parameters.1.value
+...
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util-raku.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util-raku.yaml
index 64b6ad2..5fb8712 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util-raku.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util-raku.yaml
@@ -10,9 +10,9 @@ spec:
     inputs:
       parameters:
       - name: fezUsernameSecret
-        value: "argo-credentials-fez"
+        value: "credentials-fez"
       - name: fezPasswordSecret
-        value: "argo-credentials-fez"
+        value: "credentials-fez"
       - name: fezUsernameSecretKey
         value: "username"
       - name: fezPasswordSecretKey
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util.yaml
index 465311b..d46c6d1 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/util.yaml
@@ -46,7 +46,7 @@ spec:
       - name: size
         value: 1Gi
       - name: storageClass
-        value: longhorn
+        value: longhorn-nonreplicated
       - name: namePrefix
         value: argo-
     outputs: