.webhook_bridge/pipeline-build-semver.yaml

@@ -61,11 +61,13 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
+        runAfter:
+          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -86,7 +88,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -101,74 +103,44 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6//kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.detect-tag.results.tag)"
-              type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.detect-tag.results.tag)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--destination=$(params.image-name)" # Also write the :latest image
-              - "target=$(params.target-name)"
+              - "--target=$(params.target-name)"
-              - --import-cache
+              - --cache=true
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-copy-layers
-              - --export-cache
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --use-new-run # Should result in a speed-up
-              - --opt
+              - --reproducible # To remove timestamps so layer caching works.
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --snapshot-mode=redo
-          - name: BUILDKITD_TOML
+              - --skip-unused-stages=true
-            value: |
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
         runAfter:
-          - fetch-repository
+          - detect-tag
     finally:
       - name: report-success
         when:
@@ -179,7 +151,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -208,7 +180,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -253,4 +225,4 @@ spec:
     - name: path-to-image-context
       value: .
     - name: path-to-dockerfile
-      value: docker/webhook_bridge/
+      value: docker/webhook_bridge/Dockerfile

.webhook_bridge/pipeline-format.yaml

@@ -29,11 +29,13 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
+        runAfter:
+          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -54,7 +56,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -69,67 +71,36 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target=$(params.target-name)"
-              - "target=$(params.target-name)"
+              - --cache=true
-              - --import-cache
+              - --cache-copy-layers
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --export-cache
+              - --use-new-run # Should result in a speed-up
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --reproducible # To remove timestamps so layer caching works.
-              - --opt
+              - --snapshot-mode=redo
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --skip-unused-stages=true
-          - name: BUILDKITD_TOML
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-            value: |
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
@@ -176,13 +147,13 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       - name: commit-changes
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -218,7 +189,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -247,7 +218,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -301,7 +272,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -331,4 +302,4 @@ spec:
     - name: path-to-image-context
       value: docker/webhook_bridge_development/
     - name: path-to-dockerfile
-      value: docker/webhook_bridge_development/
+      value: docker/webhook_bridge_development/Dockerfile

.webhook_bridge/pipeline-rust-clippy.yaml

@@ -29,11 +29,13 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
+        runAfter:
+          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -54,7 +56,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -69,67 +71,36 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target=$(params.target-name)"
-              - "target=$(params.target-name)"
+              - --cache=true
-              - --import-cache
+              - --cache-copy-layers
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --export-cache
+              - --use-new-run # Should result in a speed-up
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --reproducible # To remove timestamps so layer caching works.
-              - --opt
+              - --snapshot-mode=redo
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --skip-unused-stages=true
-          - name: BUILDKITD_TOML
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-            value: |
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
@@ -186,7 +157,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     finally:
       - name: report-success
         when:
@@ -197,7 +168,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -226,7 +197,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -280,7 +251,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -310,4 +281,4 @@ spec:
     - name: path-to-image-context
       value: docker/webhook_bridge_development/
     - name: path-to-dockerfile
-      value: docker/webhook_bridge_development/
+      value: docker/webhook_bridge_development/Dockerfile

.webhook_bridge/pipeline-rust-test.yaml

@@ -29,11 +29,13 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
+        runAfter:
+          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -54,7 +56,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -69,67 +71,36 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6//kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target=$(params.target-name)"
-              - "target=$(params.target-name)"
+              - --cache=true
-              - --import-cache
+              - --cache-copy-layers
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --export-cache
+              - --use-new-run # Should result in a speed-up
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --reproducible # To remove timestamps so layer caching works.
-              - --opt
+              - --snapshot-mode=redo
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --skip-unused-stages=true
-          - name: BUILDKITD_TOML
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-            value: |
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
@@ -176,7 +147,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     finally:
       - name: report-success
         when:
@@ -187,7 +158,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -216,7 +187,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -270,7 +241,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -300,4 +271,4 @@ spec:
     - name: path-to-image-context
       value: docker/webhook_bridge_development/
     - name: path-to-dockerfile
-      value: docker/webhook_bridge_development/
+      value: docker/webhook_bridge_development/Dockerfile

.webhook_bridge/pipeline-semver.yaml

@@ -26,7 +26,7 @@ spec:
     tasks:
       - name: calculate-tag
         runAfter:
-          - fetch-repository
+          - report-pending
         workspaces:
           - name: source
             workspace: git-source
@@ -72,11 +72,13 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
+        runAfter:
+          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -97,7 +99,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -122,7 +124,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
@@ -151,7 +153,7 @@ spec:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
+              value: https://github.com/tektoncd/catalog.git
             - name: revision
               value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo

docker/webhook_bridge/Dockerfile

@@ -1,18 +1,15 @@
-# syntax=docker/dockerfile:1
+FROM rustlang/rust:nightly-alpine3.20 AS builder
-ARG ALPINE_VERSION="3.20"
-
-FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS builder
 
 RUN apk add --no-cache musl-dev pkgconfig libressl-dev
 
 RUN mkdir /source
 WORKDIR /source
-COPY --link . .
+COPY . .
 # TODO: Add static build, which currently errors due to proc_macro. RUSTFLAGS="-C target-feature=+crt-static"
-RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked CARGO_TARGET_DIR=/target cargo build --profile release-lto --bin webhook_bridge
+RUN CARGO_TARGET_DIR=/target cargo build --profile release-lto --bin webhook_bridge
 
-FROM alpine:$ALPINE_VERSION AS runner
+FROM alpine:3.20 AS runner
 
-COPY --link --from=builder /target/release-lto/webhook_bridge /usr/bin/
+COPY --from=builder /target/release-lto/webhook_bridge /usr/bin/
 
 ENTRYPOINT ["/usr/bin/webhook_bridge"]

docker/webhook_bridge_development/Dockerfile

@@ -1,9 +1,6 @@
-# syntax=docker/dockerfile:1
+FROM rustlang/rust:nightly-alpine3.20 AS builder
-ARG ALPINE_VERSION="3.20"
-
-FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS builder
 
 RUN apk add --no-cache musl-dev pkgconfig libressl3.8-libssl libressl-dev
-RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked cargo install --locked --no-default-features --features ci-autoclean cargo-cache
+RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
 RUN rustup component add rustfmt
 RUN rustup component add clippy

example_tag_webhook_payload.json

@@ -0,0 +1,165 @@
+{
+  "ref": "refs/tags/v0.0.2",
+  "before": "0000000000000000000000000000000000000000",
+  "after": "84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
+  "compare_url": "https://code.fizz.buzz/talexander/webhook_bridge/compare/0000000000000000000000000000000000000000...84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
+  "commits": [],
+  "total_commits": 0,
+  "head_commit": {
+    "id": "84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
+    "message": "Add a pipeline to build the server image.\n",
+    "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
+    "author": {
+      "name": "Tom Alexander",
+      "email": "tom@fizz.buzz",
+      "username": ""
+    },
+    "committer": {
+      "name": "Tom Alexander",
+      "email": "tom@fizz.buzz",
+      "username": ""
+    },
+    "verification": null,
+    "timestamp": "2024-09-29T00:19:22-04:00",
+    "added": [
+      ".webhook_bridge/pipeline-build.yaml"
+    ],
+    "removed": [],
+    "modified": [
+      ".webhook_bridge/webhook_bridge.toml"
+    ]
+  },
+  "repository": {
+    "id": 21,
+    "owner": {
+      "id": 1,
+      "login": "talexander",
+      "login_name": "",
+      "full_name": "",
+      "email": "gitea@local.domain",
+      "avatar_url": "https://code.fizz.buzz/avatars/9d402a89b5a0786f83c1b8c5486fc7ff3d083a54fe20e55c0a776a1932c30289",
+      "language": "",
+      "is_admin": false,
+      "last_login": "0001-01-01T00:00:00Z",
+      "created": "2023-07-05T22:03:28Z",
+      "restricted": false,
+      "active": false,
+      "prohibit_login": false,
+      "location": "",
+      "website": "",
+      "description": "",
+      "visibility": "public",
+      "followers_count": 0,
+      "following_count": 0,
+      "starred_repos_count": 0,
+      "username": "talexander"
+    },
+    "name": "webhook_bridge",
+    "full_name": "talexander/webhook_bridge",
+    "description": "A server that receives webhooks from gitea and fires off Tekton jobs in response.",
+    "empty": false,
+    "private": false,
+    "fork": false,
+    "template": false,
+    "parent": null,
+    "mirror": false,
+    "size": 346,
+    "language": "",
+    "languages_url": "https://code.fizz.buzz/api/v1/repos/talexander/webhook_bridge/languages",
+    "html_url": "https://code.fizz.buzz/talexander/webhook_bridge",
+    "url": "https://code.fizz.buzz/api/v1/repos/talexander/webhook_bridge",
+    "link": "",
+    "ssh_url": "git@code.fizz.buzz:talexander/webhook_bridge.git",
+    "clone_url": "https://code.fizz.buzz/talexander/webhook_bridge.git",
+    "original_url": "",
+    "website": "",
+    "stars_count": 0,
+    "forks_count": 0,
+    "watchers_count": 1,
+    "open_issues_count": 0,
+    "open_pr_counter": 0,
+    "release_counter": 0,
+    "default_branch": "main",
+    "archived": false,
+    "created_at": "2024-07-14T18:48:52Z",
+    "updated_at": "2024-09-29T04:25:36Z",
+    "archived_at": "1970-01-01T00:00:00Z",
+    "permissions": {
+      "admin": true,
+      "push": true,
+      "pull": true
+    },
+    "has_issues": true,
+    "internal_tracker": {
+      "enable_time_tracker": true,
+      "allow_only_contributors_to_track_time": true,
+      "enable_issue_dependencies": true
+    },
+    "has_wiki": true,
+    "has_pull_requests": true,
+    "has_projects": true,
+    "has_releases": true,
+    "has_packages": true,
+    "has_actions": false,
+    "ignore_whitespace_conflicts": false,
+    "allow_merge_commits": true,
+    "allow_rebase": true,
+    "allow_rebase_explicit": true,
+    "allow_squash_merge": true,
+    "allow_rebase_update": true,
+    "default_delete_branch_after_merge": false,
+    "default_merge_style": "merge",
+    "default_allow_maintainer_edit": false,
+    "avatar_url": "",
+    "internal": false,
+    "mirror_interval": "",
+    "mirror_updated": "0001-01-01T00:00:00Z",
+    "repo_transfer": null
+  },
+  "pusher": {
+    "id": 2,
+    "login": "build-bot",
+    "login_name": "",
+    "full_name": "",
+    "email": "build-bot@noreply.code.fizz.buzz",
+    "avatar_url": "https://secure.gravatar.com/avatar/e39ef2faba8a3dfb3dcb4d8275a532d4?d=identicon",
+    "language": "",
+    "is_admin": false,
+    "last_login": "0001-01-01T00:00:00Z",
+    "created": "2023-07-09T04:25:44Z",
+    "restricted": false,
+    "active": false,
+    "prohibit_login": false,
+    "location": "",
+    "website": "",
+    "description": "",
+    "visibility": "private",
+    "followers_count": 0,
+    "following_count": 0,
+    "starred_repos_count": 0,
+    "username": "build-bot"
+  },
+  "sender": {
+    "id": 2,
+    "login": "build-bot",
+    "login_name": "",
+    "full_name": "",
+    "email": "build-bot@noreply.code.fizz.buzz",
+    "avatar_url": "https://secure.gravatar.com/avatar/e39ef2faba8a3dfb3dcb4d8275a532d4?d=identicon",
+    "language": "",
+    "is_admin": false,
+    "last_login": "0001-01-01T00:00:00Z",
+    "created": "2023-07-09T04:25:44Z",
+    "restricted": false,
+    "active": false,
+    "prohibit_login": false,
+    "location": "",
+    "website": "",
+    "description": "",
+    "visibility": "private",
+    "followers_count": 0,
+    "following_count": 0,
+    "starred_repos_count": 0,
+    "username": "build-bot"
+  }
+}

example_webhook_payload.json

@@ -1,13 +1,13 @@
 {
   "ref": "refs/heads/main",
-  "before": "f3b00c46ea57d5314063ad6fbfcaf9e38712cafe",
+  "before": "a2aca6d2f1c85b5d4bef1349230fdaef1683622d",
-  "after": "e991b259f2bdf3f24a2cba309a93d81f32ab7f50",
+  "after": "84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
-  "compare_url": "https://code.fizz.buzz/talexander/webhook_bridge/compare/f3b00c46ea57d5314063ad6fbfcaf9e38712cafe...e991b259f2bdf3f24a2cba309a93d81f32ab7f50",
+  "compare_url": "https://code.fizz.buzz/talexander/webhook_bridge/compare/a2aca6d2f1c85b5d4bef1349230fdaef1683622d...84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
   "commits": [
     {
-      "id": "e991b259f2bdf3f24a2cba309a93d81f32ab7f50",
+      "id": "84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
-      "message": "Add source_id to HookUser.\n\nThis must be a new field that gitea added in an update.\n",
+      "message": "Add a pipeline to build the server image.\n",
-      "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/e991b259f2bdf3f24a2cba309a93d81f32ab7f50",
+      "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
       "author": {
         "name": "Tom Alexander",
         "email": "tom@fizz.buzz",
@@ -19,24 +19,21 @@
         "username": ""
       },
       "verification": null,
-      "timestamp": "2024-10-18T19:41:56-04:00",
+      "timestamp": "2024-09-29T00:19:22-04:00",
-      "added": [],
+      "added": [
+        ".webhook_bridge/pipeline-build.yaml"
+      ],
       "removed": [],
       "modified": [
-        ".webhook_bridge/pipeline-build-semver.yaml",
+        ".webhook_bridge/webhook_bridge.toml"
-        ".webhook_bridge/pipeline-format.yaml",
-        ".webhook_bridge/pipeline-rust-clippy.yaml",
-        ".webhook_bridge/pipeline-rust-test.yaml",
-        ".webhook_bridge/pipeline-semver.yaml",
-        "src/hook_push.rs"
       ]
     }
   ],
   "total_commits": 1,
   "head_commit": {
-    "id": "e991b259f2bdf3f24a2cba309a93d81f32ab7f50",
+    "id": "84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
-    "message": "Add source_id to HookUser.\n\nThis must be a new field that gitea added in an update.\n",
+    "message": "Add a pipeline to build the server image.\n",
-    "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/e991b259f2bdf3f24a2cba309a93d81f32ab7f50",
+    "url": "https://code.fizz.buzz/talexander/webhook_bridge/commit/84fe1ec23ae242cb1bbccbc2ab999c3082f54d45",
     "author": {
       "name": "Tom Alexander",
       "email": "tom@fizz.buzz",
@@ -48,16 +45,13 @@
       "username": ""
     },
     "verification": null,
-    "timestamp": "2024-10-18T19:41:56-04:00",
+    "timestamp": "2024-09-29T00:19:22-04:00",
-    "added": [],
+    "added": [
+      ".webhook_bridge/pipeline-build.yaml"
+    ],
     "removed": [],
     "modified": [
-      ".webhook_bridge/pipeline-build-semver.yaml",
+      ".webhook_bridge/webhook_bridge.toml"
-      ".webhook_bridge/pipeline-format.yaml",
-      ".webhook_bridge/pipeline-rust-clippy.yaml",
-      ".webhook_bridge/pipeline-rust-test.yaml",
-      ".webhook_bridge/pipeline-semver.yaml",
-      "src/hook_push.rs"
     ]
   },
   "repository": {
@@ -66,11 +60,9 @@
       "id": 1,
       "login": "talexander",
       "login_name": "",
-      "source_id": 0,
       "full_name": "",
       "email": "gitea@local.domain",
       "avatar_url": "https://code.fizz.buzz/avatars/9d402a89b5a0786f83c1b8c5486fc7ff3d083a54fe20e55c0a776a1932c30289",
-      "html_url": "https://code.fizz.buzz/talexander",
       "language": "",
       "is_admin": false,
       "last_login": "0001-01-01T00:00:00Z",
@@ -96,7 +88,7 @@
     "template": false,
     "parent": null,
     "mirror": false,
-    "size": 151,
+    "size": 343,
     "language": "",
     "languages_url": "https://code.fizz.buzz/api/v1/repos/talexander/webhook_bridge/languages",
     "html_url": "https://code.fizz.buzz/talexander/webhook_bridge",
@@ -115,7 +107,7 @@
     "default_branch": "main",
     "archived": false,
     "created_at": "2024-07-14T18:48:52Z",
-    "updated_at": "2024-09-30T04:41:20Z",
+    "updated_at": "2024-09-29T04:14:47Z",
     "archived_at": "1970-01-01T00:00:00Z",
     "permissions": {
       "admin": true,
@@ -128,19 +120,17 @@
       "allow_only_contributors_to_track_time": true,
       "enable_issue_dependencies": true
     },
-    "has_wiki": false,
+    "has_wiki": true,
     "has_pull_requests": true,
-    "has_projects": false,
+    "has_projects": true,
-    "projects_mode": "all",
     "has_releases": true,
-    "has_packages": false,
+    "has_packages": true,
     "has_actions": false,
     "ignore_whitespace_conflicts": false,
     "allow_merge_commits": true,
     "allow_rebase": true,
     "allow_rebase_explicit": true,
     "allow_squash_merge": true,
-    "allow_fast_forward_only_merge": false,
     "allow_rebase_update": true,
     "default_delete_branch_after_merge": false,
     "default_merge_style": "merge",
@@ -148,7 +138,6 @@
     "avatar_url": "",
     "internal": false,
     "mirror_interval": "",
-    "object_format_name": "sha1",
     "mirror_updated": "0001-01-01T00:00:00Z",
     "repo_transfer": null
   },
@@ -156,11 +145,9 @@
     "id": 1,
     "login": "talexander",
     "login_name": "",
-    "source_id": 0,
     "full_name": "",
     "email": "talexander@noreply.code.fizz.buzz",
     "avatar_url": "https://code.fizz.buzz/avatars/9d402a89b5a0786f83c1b8c5486fc7ff3d083a54fe20e55c0a776a1932c30289",
-    "html_url": "https://code.fizz.buzz/talexander",
     "language": "",
     "is_admin": false,
     "last_login": "0001-01-01T00:00:00Z",
@@ -181,11 +168,9 @@
     "id": 1,
     "login": "talexander",
     "login_name": "",
-    "source_id": 0,
     "full_name": "",
     "email": "talexander@noreply.code.fizz.buzz",
     "avatar_url": "https://code.fizz.buzz/avatars/9d402a89b5a0786f83c1b8c5486fc7ff3d083a54fe20e55c0a776a1932c30289",
-    "html_url": "https://code.fizz.buzz/talexander",
     "language": "",
     "is_admin": false,
     "last_login": "0001-01-01T00:00:00Z",

run.bash

@@ -4,4 +4,4 @@ set -euo pipefail
 IFS=$'\n\t'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-RUST_LOG=webhook_bridge=DEBUG WEBHOOK_BRIDGE_API_ROOT="https://code.fizz.buzz/api" WEBHOOK_BRIDGE_HMAC_SECRET=$(cat /bridge/git/mrmanager/k8s/webhook_bridge/secrets/webhook-bridge/webhook-bridge/HMAC_TOKEN) WEBHOOK_BRIDGE_OAUTH_TOKEN=$(cat /bridge/git/mrmanager/k8s/webhook_bridge/secrets/webhook-bridge/webhook-bridge/OAUTH_TOKEN) WEBHOOK_BRIDGE_REPO_WHITELIST="talexander/webhook_bridge,talexander/homepage,talexander/natter,talexander/poudboot,talexander/ta_waybar_pipewire,talexander/organic" cargo run
+RUST_LOG=webhook_bridge=DEBUG WEBHOOK_BRIDGE_API_ROOT="https://code.fizz.buzz/api" WEBHOOK_BRIDGE_HMAC_SECRET=$(cat /bridge/git/mrmanager/k8s/webhook-bridge/secrets/webhook-bridge/webhook-bridge/HMAC_TOKEN) WEBHOOK_BRIDGE_OAUTH_TOKEN=$(cat /bridge/git/mrmanager/k8s/webhook-bridge/secrets/webhook-bridge/webhook-bridge/OAUTH_TOKEN) cargo run

rust-toolchain.toml

@@ -1,4 +0,0 @@
-[toolchain]
-channel = "nightly"
-profile = "default"
-components = ["clippy", "rustfmt"]

src/app_state.rs

@@ -1,7 +1,13 @@
 use std::collections::HashSet;
 use std::sync::Arc;
 
+use kube::Client;
+
+use crate::gitea_client::GiteaClient;
+
 #[derive(Clone)]
 pub(crate) struct AppState {
+    pub(crate) kubernetes_client: Client,
+    pub(crate) gitea: GiteaClient,
     pub(crate) allowed_repos: Arc<HashSet<String>>,
 }

src/bin_local_trigger.rs

@@ -2,7 +2,7 @@
 use webhookbridge::init_tracing;
 use webhookbridge::local_trigger;
 
-const EXAMPLE_WEBHOOK_PAYLOAD: &str = include_str!("../local_payload.json");
+const EXAMPLE_WEBHOOK_PAYLOAD: &str = include_str!("../example_tag_webhook_payload.json");
 
 #[tokio::main]
 #[allow(clippy::needless_return)]

src/hook_push.rs

@@ -28,12 +28,9 @@ pub(crate) struct HookUser {
     id: u64,
     login: String,
     login_name: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    source_id: Option<u64>,
     full_name: String,
     email: String,
     avatar_url: String,
-    html_url: String,
     language: String,
     is_admin: bool,
     last_login: String, // TODO: parse to datetime
@@ -93,7 +90,6 @@ pub(crate) struct HookRepository {
     has_wiki: bool,
     has_pull_requests: bool,
     has_projects: bool,
-    projects_mode: String,
     has_releases: bool,
     has_packages: bool,
     has_actions: bool,
@@ -102,7 +98,6 @@ pub(crate) struct HookRepository {
     allow_rebase: bool,
     allow_rebase_explicit: bool,
     allow_squash_merge: bool,
-    allow_fast_forward_only_merge: bool,
     allow_rebase_update: bool,
     default_delete_branch_after_merge: bool,
     default_merge_style: String,
@@ -110,11 +105,8 @@ pub(crate) struct HookRepository {
     avatar_url: String,
     internal: bool,
     mirror_interval: String,
-    object_format_name: String,
     mirror_updated: String, // TODO: parse to datetime
     repo_transfer: Value,   // Was null in test hook
-    topics: Value,          // Was null in test hook
-    licenses: Value,        // Was null in test hook
 }
 
 #[allow(dead_code)]

src/lib.rs

@@ -47,6 +47,14 @@ pub async fn init_tracing() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 pub async fn launch_server() -> Result<(), Box<dyn std::error::Error>> {
+    let kubernetes_client: Client = Client::try_default()
+        .await
+        .expect("Set KUBECONFIG to a valid kubernetes config.");
+
+    let gitea_api_root = std::env::var("WEBHOOK_BRIDGE_API_ROOT")?;
+    let gitea_api_token = std::env::var("WEBHOOK_BRIDGE_OAUTH_TOKEN")?;
+    let gitea = GiteaClient::new(gitea_api_root, gitea_api_token);
+
     let allowed_repos = std::env::var("WEBHOOK_BRIDGE_REPO_WHITELIST")?;
     let allowed_repos: HashSet<_> = allowed_repos
         .split(",")
@@ -65,6 +73,8 @@ pub async fn launch_server() -> Result<(), Box<dyn std::error::Error>> {
             TimeoutLayer::new(Duration::from_secs(600)),
         ))
         .with_state(AppState {
+            kubernetes_client,
+            gitea,
             allowed_repos: Arc::new(allowed_repos),
         });