Merge branch 'master' into update/etcd

feat: update etcd to 3.6.10
2026-05-02 11:47:46 +10:00 · 2026-05-02 01:47:50 +10:00
10 changed files with 3 additions and 112 deletions
@@ -13,13 +13,6 @@ steps:
    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
@@ -13,13 +13,6 @@ steps:
    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
@@ -14,13 +14,6 @@ steps:
    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
@@ -41,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]
@@ -14,13 +14,6 @@ steps:
    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
@@ -41,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]
@@ -12,9 +12,9 @@ builds:
  - almalinux/el8
  image: git.unkin.net/unkin/almalinux8-rpmbuilder:latest
  release: 1
-  version: 3.6.7
+  version: 3.6.10
 - repository:
  - almalinux/el9
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
  release: 1
-  version: 3.6.7
+  version: 3.6.10
@@ -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
@@ -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
@@ -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
@@ -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
@@ -18,10 +18,3 @@ builds:
  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
  release: 1
  version: 2.46.3
- repository:
-  - fedora/42
-  - fedora/43
-  - fedora/44
-  image: git.unkin.net/unkin/almalinux9-rpmbuilder:latest
-  release: 1
-  version: 2.46.3
Author	SHA1	Message	Date
unkinben	738871a692	Merge branch 'master' into update/etcd ci/woodpecker/pr/pre-commit Pipeline was successful Details ci/woodpecker/pr/build-almalinux8 Pipeline was successful Details ci/woodpecker/pr/build-almalinux9 Pipeline was successful Details	2026-05-02 11:47:46 +10:00
unkinben	449034a4a1	feat: update etcd to 3.6.10 ci/woodpecker/pr/pre-commit Pipeline was successful Details ci/woodpecker/pr/build-almalinux9 Pipeline failed Details ci/woodpecker/pr/build-almalinux8 Pipeline was successful Details	2026-05-02 01:47:50 +10:00