Merge branch 'master' into update/stalwart-cli

.woodpecker/build-almalinux8.yaml

@@ -7,18 +7,12 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el8 --buildah
     privileged: true
     backend_options:
       kubernetes:
         serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
 
   - name: show rpms
     image: git.unkin.net/unkin/almalinux8-base:latest

.woodpecker/build-almalinux9.yaml

@@ -7,18 +7,12 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el9 --buildah
     privileged: true
     backend_options:
       kubernetes:
         serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
 
   - name: show rpms
     image: git.unkin.net/unkin/almalinux9-base:latest

.woodpecker/build-fedora42.yaml

@@ -1,26 +0,0 @@
-when:
-  - event: pull_request
-
-steps:
-  - name: build rpms
-    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
-    commands:
-      - mkdir -p /woodpecker/rpms
-      - ln -s /woodpecker/rpms /workspace
-      - ./tools/build build-all --distro fedora/42 --buildah
-    privileged: true
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
-
-  - name: show rpms
-    image: git.unkin.net/unkin/fedora42-base:latest
-    commands:
-      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/build-fedora43.yaml

@@ -1,26 +0,0 @@
-when:
-  - event: pull_request
-
-steps:
-  - name: build rpms
-    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
-    commands:
-      - mkdir -p /woodpecker/rpms
-      - ln -s /woodpecker/rpms /workspace
-      - ./tools/build build-all --distro fedora/43 --buildah
-    privileged: true
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
-
-  - name: show rpms
-    image: git.unkin.net/unkin/fedora43-base:latest
-    commands:
-      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/build-fedora44.yaml

@@ -1,26 +0,0 @@
-when:
-  - event: pull_request
-
-steps:
-  - name: build rpms
-    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
-    commands:
-      - mkdir -p /woodpecker/rpms
-      - ln -s /woodpecker/rpms /workspace
-      - ./tools/build build-all --distro fedora/44 --buildah
-    privileged: true
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
-
-  - name: show rpms
-    image: git.unkin.net/unkin/fedora44-base:latest
-    commands:
-      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"

.woodpecker/deploy-almalinux8.yaml

@@ -8,18 +8,12 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el8 --buildah
     privileged: true
     backend_options:
       kubernetes:
         serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
 
   - name: show-rpms
     image: git.unkin.net/unkin/almalinux9-base:latest
@@ -40,11 +34,4 @@ steps:
     backend_options:
       kubernetes:
         serviceAccountName: default
-        resources:
-          requests:
-            memory: 128Mi
-            cpu: 100m
-          limits:
-            memory: 512Mi
-            cpu: 500m
     depends_on: [build-rpms, show-rpms]

.woodpecker/deploy-almalinux9.yaml

@@ -8,18 +8,12 @@ steps:
     commands:
       - mkdir -p /woodpecker/rpms
       - ln -s /woodpecker/rpms /workspace
+      - dnf install buildah -y
       - ./tools/build build-all --distro almalinux/el9 --buildah
     privileged: true
     backend_options:
       kubernetes:
         serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
 
   - name: show-rpms
     image: git.unkin.net/unkin/almalinux9-base:latest
@@ -40,11 +34,4 @@ steps:
     backend_options:
       kubernetes:
         serviceAccountName: default
-        resources:
-          requests:
-            memory: 128Mi
-            cpu: 100m
-          limits:
-            memory: 512Mi
-            cpu: 500m
     depends_on: [build-rpms, show-rpms]

.woodpecker/deploy-fedora42.yaml

@@ -1,50 +0,0 @@
-when:
-  - event: push
-    branch: master
-
-steps:
-  - name: build-rpms
-    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
-    commands:
-      - mkdir -p /woodpecker/rpms
-      - ln -s /woodpecker/rpms /workspace
-      - ./tools/build build-all --distro fedora/42 --buildah
-    privileged: true
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
-
-  - name: show-rpms
-    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
-    commands:
-      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
-    depends_on: [build-rpms]
-
-  - name: deploy-rpms
-    image: git.unkin.net/unkin/fedora42-rpmbuilder:latest
-    commands:
-      - |
-        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
-          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/fedora/42/upload
-        done
-    environment:
-      DRONECI_PASSWORD:
-        from_secret: DRONECI_PASSWORD
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 128Mi
-            cpu: 100m
-          limits:
-            memory: 512Mi
-            cpu: 500m
-    depends_on: [build-rpms, show-rpms]

.woodpecker/deploy-fedora43.yaml

@@ -1,50 +0,0 @@
-when:
-  - event: push
-    branch: master
-
-steps:
-  - name: build-rpms
-    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
-    commands:
-      - mkdir -p /woodpecker/rpms
-      - ln -s /woodpecker/rpms /workspace
-      - ./tools/build build-all --distro fedora/43 --buildah
-    privileged: true
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
-
-  - name: show-rpms
-    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
-    commands:
-      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
-    depends_on: [build-rpms]
-
-  - name: deploy-rpms
-    image: git.unkin.net/unkin/fedora43-rpmbuilder:latest
-    commands:
-      - |
-        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
-          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/fedora/43/upload
-        done
-    environment:
-      DRONECI_PASSWORD:
-        from_secret: DRONECI_PASSWORD
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 128Mi
-            cpu: 100m
-          limits:
-            memory: 512Mi
-            cpu: 500m
-    depends_on: [build-rpms, show-rpms]

.woodpecker/deploy-fedora44.yaml

@@ -1,50 +0,0 @@
-when:
-  - event: push
-    branch: master
-
-steps:
-  - name: build-rpms
-    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
-    commands:
-      - mkdir -p /woodpecker/rpms
-      - ln -s /woodpecker/rpms /workspace
-      - ./tools/build build-all --distro fedora/44 --buildah
-    privileged: true
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 512Mi
-            cpu: 1
-          limits:
-            memory: 2Gi
-            cpu: 2
-
-  - name: show-rpms
-    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
-    commands:
-      - find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"
-    depends_on: [build-rpms]
-
-  - name: deploy-rpms
-    image: git.unkin.net/unkin/fedora44-rpmbuilder:latest
-    commands:
-      - |
-        for rpm in $(find /woodpecker/src/git.unkin.net/unkin/rpmbuilder/ -type f -name "*.rpm"); do
-          curl --user droneci:$${DRONECI_PASSWORD} --upload-file $rpm https://git.unkin.net/api/packages/unkin/rpm/fedora/44/upload
-        done
-    environment:
-      DRONECI_PASSWORD:
-        from_secret: DRONECI_PASSWORD
-    backend_options:
-      kubernetes:
-        serviceAccountName: default
-        resources:
-          requests:
-            memory: 128Mi
-            cpu: 100m
-          limits:
-            memory: 512Mi
-            cpu: 500m
-    depends_on: [build-rpms, show-rpms]

rpms/cni-plugins/metadata.yaml

@@ -12,9 +12,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 1.9.1
+  version: 1.9.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 1.9.1
+  version: 1.9.0

rpms/incus/metadata.yaml

@@ -11,4 +11,4 @@ builds:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 6.23.0
+  version: 6.20.0

rpms/jsonnet/metadata.yaml

@@ -1,15 +1,14 @@
+---
 arch: amd64
 builds:
-- image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1
+    release: '1'
-  repository:
+    repository: [almalinux/el8]
-  - almalinux/el8
+    version: 0.21.0
-  version: 0.22.0
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
-  release: 1
+    repository: [almalinux/el9]
-  repository:
+    version: 0.21.0
-  - almalinux/el9
-  version: 0.22.0
 description: A data templating language
 github: google/go-jsonnet
 homepage: https://github.com/google/go-jsonnet

rpms/kubecolor/metadata.yaml

@@ -1,20 +0,0 @@
----
-name: kubecolor
-github: kubecolor/kubecolor
-description: Colorize your kubectl output
-arch: amd64
-platform: linux
-maintainer: kubecolor
-homepage: https://github.com/kubecolor/kubecolor
-license: Apache-2.0
-builds:
-- repository:
-  - almalinux/el8
-  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1
-  version: 0.6.0
-- repository:
-  - almalinux/el9
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1
-  version: 0.6.0

rpms/kubecolor/resources/build.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/bash
-
-set -e
-
-wget -O /app/kubecolor_${PACKAGE_VERSION}_linux_amd64.tar.gz https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/github/kubecolor/kubecolor/releases/download/v${PACKAGE_VERSION}/kubecolor_${PACKAGE_VERSION}_linux_amd64.tar.gz
-tar xf /app/kubecolor_${PACKAGE_VERSION}_linux_amd64.tar.gz -C /app/ kubecolor
-
-envsubst < /app/resources/nfpm.yaml > /app/nfpm.yaml
-
-nfpm pkg --config /app/nfpm.yaml --target /app/dist --packager rpm

rpms/kubecolor/resources/nfpm.yaml

@@ -1,30 +0,0 @@
-# nfpm.yaml
-
-name: ${PACKAGE_NAME}
-version: ${PACKAGE_VERSION}
-release: ${PACKAGE_RELEASE}
-arch: ${PACKAGE_ARCH}
-platform: ${PACKAGE_PLATFORM}
-section: default
-priority: extra
-description: "${PACKAGE_DESCRIPTION}"
-
-maintainer: ${PACKAGE_MAINTAINER}
-homepage: ${PACKAGE_HOMEPAGE}
-license: ${PACKAGE_LICENSE}
-
-disable_globbing: false
-
-replaces:
-  - kubecolor
-
-provides:
-  - kubecolor
-
-contents:
-  - src: /app/kubecolor
-    dst: /usr/bin/kubecolor
-    file_info:
-      mode: 0755
-      owner: root
-      group: root

rpms/node_exporter/metadata.yaml

@@ -11,9 +11,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 1.11.1
+  version: 1.10.2
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 1.11.1
+  version: 1.10.2

rpms/pgbouncer_exporter/metadata.yaml

@@ -1,15 +1,14 @@
+---
 arch: amd64
 builds:
-- image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
+  - image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
-  release: 1
+    release: '1'
-  repository:
+    repository: [almalinux/el8]
-  - almalinux/el8
+    version: 0.11.0
-  version: 0.12.0
+  - image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-- image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
+    release: '1'
-  release: 1
+    repository: [almalinux/el9]
-  repository:
+    version: 0.11.0
-  - almalinux/el9
-  version: 0.12.0
 description: Prometheus exporter for PgBouncer
 github: prometheus-community/pgbouncer_exporter
 homepage: https://github.com/prometheus-community/pgbouncer_exporter

rpms/ruff/metadata.yaml

@@ -11,9 +11,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 0.15.12
+  version: 0.14.10
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 0.15.12
+  version: 0.14.10

rpms/stalwart-cli/metadata.yaml

@@ -11,9 +11,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 0.15.3
+  version: 0.16.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 0.15.3
+  version: 0.16.3

rpms/stalwart-foundationdb/metadata.yaml

@@ -12,9 +12,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 0.16.3
+  version: 0.15.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 0.16.3
+  version: 0.15.3

rpms/stalwart/metadata.yaml

@@ -11,9 +11,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 0.16.3
+  version: 0.15.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 0.16.3
+  version: 0.15.3

rpms/terraform/metadata.yaml

@@ -14,9 +14,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 1.15.0
+  version: 1.14.3
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 1.15.0
+  version: 1.14.3

rpms/vmagent/metadata.yaml

@@ -12,9 +12,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 1.142.0
+  version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 1.142.0
+  version: 1.132.0

rpms/vmalert/metadata.yaml

@@ -11,9 +11,9 @@ builds:
   - almalinux/el8
   image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
   release: 1
-  version: 1.142.0
+  version: 1.132.0
 - repository:
   - almalinux/el9
   image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
   release: 1
-  version: 1.142.0
+  version: 1.132.0