Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backports: for v1.9.0 #556

Merged
merged 9 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .conform.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-08-01T17:25:51Z by kres faf91e3.
# Generated on 2024-12-17T09:51:12Z by kres 318187b.

policies:
- type: commit
Expand All @@ -12,7 +12,7 @@ policies:
gitHubOrganization: siderolabs
spellcheck:
locale: US
maximumOfOneCommit: true
maximumOfOneCommit: false
header:
length: 89
imperative: true
Expand Down
105 changes: 42 additions & 63 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,122 +1,101 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"description": "THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.\n\nGenerated on 2024-12-17T10:03:38Z by kres 318187b.\n\n",
"prHeader": "Update Request | Renovate Bot",
"extends": [
":dependencyDashboard",
":gitSignOff",
":semanticCommitScopeDisabled",
"schedule:earlyMondays"
],
"regexManagers": [
"customManagers": [
{
"customType": "regex",
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}",
"fileMatch": [
"vars.yaml"
],
"matchStrings": [
"# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:(\\s)?.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
],
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
]
},
{
"customType": "regex",
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}",
"fileMatch": [
"Pkgfile"
],
"matchStrings": [
"# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:\\s+.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:\\s.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
],
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
]
},
{
"customType": "regex",
"datasourceTemplate": "github-tags",
"depNameTemplate": "siderolabs/bldr",
"versioningTemplate": "semver",
"fileMatch": [
"Pkgfile"
],
"matchStrings": [
"ghcr.io\\/siderolabs\\/bldr:(?<currentValue>v.*)"
],
"depNameTemplate": "siderolabs/bldr",
"datasourceTemplate": "github-tags",
"versioningTemplate": "semver"
]
},
{
"customType": "regex",
"datasourceTemplate": "github-tags",
"depNameTemplate": "siderolabs/bldr",
"versioningTemplate": "semver",
"fileMatch": [
"Makefile"
],
"matchStrings": [
"BLDR_RELEASE\\s+\\?=\\s+(?<currentValue>.*)\\n"
],
"depNameTemplate": "siderolabs/bldr",
"datasourceTemplate": "github-tags",
"versioningTemplate": "semver"
]
}
],
"packageRules": [
{
"groupName": "dependencies",
"matchUpdateTypes": [
"major",
"minor",
"patch",
"pin",
"digest"
]
},
{
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?$",
"matchPackageNames": [
"nvidia/open-gpu-kernel-modules",
"open-iscsi/open-isns",
"containers/crun",
"git://git.kernel.org/pub/scm/libs/libcap/libcap.git",
"git://sourceware.org/git/elfutils.git",
"git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git"
],
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?$"
]
},
{
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>[0-9]{1,3})?$",
"matchPackageNames": [
"https://sourceware.org/git/glibc.git"
],
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>[0-9]{1,3})?$"
]
},
{
"versioning": "regex:^(?<major>\\d{4})(?<minor>\\d{2})(?<patch>\\d{2})\\.?(?<build>\\d+)?$",
"matchPackageNames": [
"google/gvisor",
"intel/Intel-Linux-Processor-Microcode-Data-Files"
],
"versioning": "regex:^(?<major>\\d{4})(?<minor>\\d{2})(?<patch>\\d{2})\\.?(?<build>\\d+)?$"
"intel/Intel-Linux-Processor-Microcode-Data-Files",
"cloudflare/cloudflared"
]
},
{
"versioning": "regex:^(?<major>\\d+)-(?<minor>\\d+)-?(?<patch>\\d+)?$",
"matchPackageNames": [
"git://linux-nfs.org/~steved/libtirpc"
],
"versioning": "regex:^(?<major>\\d+)-(?<minor>\\d+)-?(?<patch>\\d+)?$"
},
{
"matchPackagePatterns": [
"*"
],
"matchDatasources": [
"docker"
],
"groupName": "container images"
},
{
"matchPackagePatterns": [
"*"
],
"matchDatasources": [
"go",
"golang-version"
],
"groupName": "go packages"
},
{
"matchPackagePatterns": [
"*"
],
"matchDatasources": [
"npm"
],
"groupName": "node packages"
},
{
"matchPackagePatterns": [
"*"
],
"matchDatasources": [
"git-refs",
"git-tags",
"github-tags",
"github-releases"
],
"groupName": "releases"
]
}
],
"dependencyDashboard": true
"separateMajorMinor": false
}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-12-10T14:07:06Z by kres 8183c20.
# Generated on 2024-12-17T09:55:10Z by kres 318187b.

name: default
concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-12-10T14:07:06Z by kres 8183c20.
# Generated on 2024-12-17T09:55:10Z by kres 318187b.

name: weekly
concurrency:
Expand Down
60 changes: 59 additions & 1 deletion .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ spec:
- btrfs
- chelsio-drivers
- chelsio-firmware
- cloudflared
- crun
- drbd
- dvb-cx23885
- ecr-credential-provider
- fuse3
- gasket-driver
Expand Down Expand Up @@ -63,7 +65,7 @@ spec:
- name: EXTENSIONS_IMAGE_REF
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
- name: PKGS
defaultValue: v1.9.0-6-gabba1d8
defaultValue: v1.9.0-12-g9576b97
- name: PKGS_PREFIX
defaultValue: ghcr.io/siderolabs
useBldrPkgTagResolver: true
Expand Down Expand Up @@ -165,3 +167,59 @@ spec:
cosign verify $$image --certificate-identity-regexp '@siderolabs\.com$$' --certificate-oidc-issuer https://accounts.google.com || \
cosign sign --yes $$image; \
done
---
kind: common.Repository
spec:
conformMaximumOfOneCommit: false
---
kind: common.Renovate
spec:
customManagers:
- customType: regex
fileMatch:
- vars.yaml
matchStrings:
- '# renovate: datasource=(?<datasource>.*?)(?:\s+extractVersion=(?<extractVersion>.+?))?(?:\s+versioning=(?<versioning>.+?))?\s+depName=(?<depName>.+?)?\s(?:.*_(?:version|VERSION):\s+(?<currentValue>.*))?(?:(\s)?.*_(?:ref|REF):\s+(?<currentDigest>.*))?'
versioningTemplate: "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
- customType: regex
fileMatch:
- Pkgfile
matchStrings:
- '# renovate: datasource=(?<datasource>.*?)(?:\s+extractVersion=(?<extractVersion>.+?))?(?:\s+versioning=(?<versioning>.+?))?\s+depName=(?<depName>.+?)?\s(?:\s+.*_(?:version|VERSION):\s+(?<currentValue>.*))?(?:\s.*_(?:ref|REF):\s+(?<currentDigest>.*))?'
versioningTemplate: "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
- customType: regex
fileMatch:
- Pkgfile
matchStrings:
- ghcr.io\/siderolabs\/bldr:(?<currentValue>v.*)
depNameTemplate: siderolabs/bldr
datasourceTemplate: github-tags
versioningTemplate: semver
- customType: regex
fileMatch:
- Makefile
matchStrings:
- BLDR_RELEASE\s+\?=\s+(?<currentValue>.*)\n
depNameTemplate: siderolabs/bldr
datasourceTemplate: github-tags
versioningTemplate: semver
packageRules:
- matchPackageNames:
- nvidia/open-gpu-kernel-modules
- open-iscsi/open-isns
- containers/crun
- git://git.kernel.org/pub/scm/libs/libcap/libcap.git
- git://sourceware.org/git/elfutils.git
- git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git
versioning: 'regex:^(?<major>\d+)\.(?<minor>\d+)\.?(?<patch>\d+)?$'
- matchPackageNames:
- https://sourceware.org/git/glibc.git
versioning: 'regex:^(?<major>\d+)\.(?<minor>\d+)\.?(?<patch>[0-9]{1,3})?$'
- matchPackageNames:
- google/gvisor
- intel/Intel-Linux-Processor-Microcode-Data-Files
- cloudflare/cloudflared
versioning: 'regex:^(?<major>\d{4})(?<minor>\d{2})(?<patch>\d{2})\.?(?<build>\d+)?$'
- matchPackageNames:
- git://linux-nfs.org/~steved/libtirpc
versioning: 'regex:^(?<major>\d+)-(?<minor>\d+)-?(?<patch>\d+)?$'
6 changes: 4 additions & 2 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,24 @@ If the field is marked as `Needs Maintainer`, it means that the package is curre

| Name | Maintainer | Github ID |
| ----------------------------------------- | -------------------- | -------------------------------------------------------------------- |
| amdgpu-firmware | Sidero Labs | NA |
| amdgpu | Sidero Labs | NA |
| amd-ucode | Sidero Labs | NA |
| binfmt-misc | Serge Logvinov | [sergelogvinov](https://github.com/sergelogvinov) |
| bnx2-bnx2x | Sidero Labs | NA |
| btrfs | Enno Boland | [Gottox](https://github.com/Gottox) |
| chelsio-drivers | Sidero Labs | NA |
| chelsio-firmware | Sidero Labs | NA |
| cloudflared | Maxime Nrb | [maxnrb](https://github.com/maxnrb) |
| crun | Henrik Gerdes | [hegerdes](https://github.com/hegerdes) |
| drbd | Needs Maintainer | NA |
| dvb-cx23885 | Skyler Mäntysaari | [samip5](https://github.com/samip5) |
| ecr-credential-provider | Florian Ströger | [Preisschild](https://github.com/Preisschild) |
| fuse3 | Sidero Labs | NA |
| gasket-driver | Sidero Labs | NA |
| gvisor | Sidero Labs | NA |
| gvisor-debug | Sidero Labs | NA |
| hello-world-service | Sidero Labs | NA |
| i915-ucode | Sidero Labs | NA |
| i915 | Sidero Labs | NA |
| intel-ice-firmware | Sidero Labs | NA |
| intel-ucode | Sidero Labs | NA |
| iscsi-tools | Sidero Labs | NA |
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-12-10T14:07:06Z by kres 8183c20.
# Generated on 2024-12-17T09:55:10Z by kres 318187b.

# common variables

Expand Down Expand Up @@ -50,7 +50,7 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)"
# extra variables

EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
PKGS ?= v1.9.0-6-gabba1d8
PKGS ?= v1.9.0-12-g9576b97
PKGS_PREFIX ?= ghcr.io/siderolabs

# targets defines all the available targets
Expand All @@ -62,8 +62,10 @@ TARGETS += bnx2-bnx2x
TARGETS += btrfs
TARGETS += chelsio-drivers
TARGETS += chelsio-firmware
TARGETS += cloudflared
TARGETS += crun
TARGETS += drbd
TARGETS += dvb-cx23885
TARGETS += ecr-credential-provider
TARGETS += fuse3
TARGETS += gasket-driver
Expand Down
4 changes: 3 additions & 1 deletion Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ format: v1alpha2
vars:
LINUX_FIRMWARE_VERSION: "20241110" # update this when updating PKGS_VERSION in Makefile
DRBD_DRIVER_VERSION: 9.2.12 # update this when updating PKGS_VERSION in Makefile
ZFS_DRIVER_VERSION: 2.3.0-rc3 # update this when updating PKGS_VERSION in Makefile
ZFS_DRIVER_VERSION: 2.2.7 # update this when updating PKGS_VERSION in Makefile
UTIL_LINUX_VERSION: 2.40.2 # update this when updating PKGS_VERSION in Makefile

# renovate: datasource=git-tags extractVersion=^libtiprc-(?<version>.*)$ depName=git://linux-nfs.org/~steved/libtirpc
LIBTIRPC_VERSION: 1-3-3
# renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=madler/zlib
ZLIB_VERSION: 1.3.1
# renovate: datasource=github-tags depName=OpenELEC/dvb-firmware
LINUX_DVB_FIRMWARE: 0.0.51

labels:
org.opencontainers.image.source: https://github.com/siderolabs/extensions
Loading