Enable webhook for building bashtard

4 files changed, 56 insertions, 4 deletions

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 cc46d43..5796540 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,8 +10,8 @@ spec:
     - port: 12000
       targetPort: 12000
   webhook:
-    example:
-      endpoint: /example
+    project-bashtard:
+      endpoint: /trigger/project-bashtard
       method: POST
       port: "12000"
       url: https://ci.tyil.nl
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
new file mode 100644
index 0000000..4f83959
--- /dev/null
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/sensors/project-bashtard.yaml
@@ -0,0 +1,52 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Sensor
+metadata:
+  name: project-bashtard
+  namespace: cicd-system
+spec:
+  template:
+    serviceAccountName: argo-events-webhook
+  dependencies:
+  - name: webhook
+    eventSourceName: webhook
+    eventName: project-bashtard
+  triggers:
+  - template:
+      name: webhook-workflow-trigger
+      k8s:
+        operation: create
+        source:
+          resource:
+            apiVersion: argoproj.io/v1alpha1
+            kind: Workflow
+            metadata:
+              generateName: project-bashtard-
+            spec:
+              entrypoint: main
+              arguments:
+                parameters:
+                - name: ref
+                  value: ""
+              templates:
+              - name: main
+                inputs:
+                  parameters:
+                  - name: ref
+                    value: "{{workflows.parameters.ref}}"
+                steps:
+                - - name: main
+                    templateRef:
+                      name: project-bashtard
+                      template: main
+                    arguments:
+                      parameters:
+                      - name: ref
+                        value: "{{inputs.parameters.ref}}"
+        parameters:
+        - src:
+            dependencyName: webhook
+            dataKey: body.commit
+            value: "master"
+          dest: spec.arguments.parameters.0.value
+...
diff --git a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/fetch-git.yaml b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/fetch-git.yaml
index 785028d..0742e79 100644
--- a/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/fetch-git.yaml
+++ b/data.d/k3s-master/manifests.d/tyilnet/cicd-system/resources/workflow-templates/fetch-git.yaml
@@ -42,5 +42,5 @@ spec:
         git init
         git remote add origin "{{inputs.parameters.repo}}"
         git fetch origin -a
-        git reset --hard "origin/{{inputs.parameters.ref}}"
+        git reset --hard "{{inputs.parameters.ref}}"
 ...
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 e2b399d..b59e5b7 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
@@ -10,7 +10,7 @@ spec:
   arguments:
     parameters:
     - name: ref
-      value: master
+      value: origin/master
   templates:
   - name: main
     steps: