Skip to content

Commit 40ad501

Browse files
frezbofrezbo
committed
chore: rekres to simplify .kres.yaml defaults
rekres to simplify `.kres.yaml` defaults. Also update deps. Signed-off-by: Noel Georgi <[email protected]>
1 parent 73fad60 commit 40ad501

File tree

16 files changed

+163
-139
lines changed

16 files changed

+163
-139
lines changed

‎.github/renovate.json‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,36 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"description": "THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.",
4+
"prHeader": "Update Request | Renovate Bot",
35
"extends": [
46
":dependencyDashboard",
57
":gitSignOff",
68
":semanticCommitScopeDisabled",
79
"schedule:earlyMondays"
810
],
9-
"prHeader": "Update Request | Renovate Bot",
10-
"regexManagers": [
11+
"customManagers": [
1112
{
13+
"customType": "regex",
14+
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}",
1215
"fileMatch": [
1316
"internal/pkg/constants/build.go"
1417
],
1518
"matchStrings": [
1619
"\\/\\/\\s+renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s.*Image\\s+=\\s+\\\"docker.io\\/alpine:(?<currentValue>.+?)\\\""
17-
],
18-
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
20+
]
1921
}
2022
],
2123
"packageRules": [
2224
{
23-
"matchPackagePatterns": [
24-
"*"
25-
],
26-
"matchDatasources": [
27-
"docker"
28-
],
29-
"groupName": "container images"
30-
},
31-
{
32-
"matchPackagePatterns": [
33-
"*"
34-
],
35-
"matchDatasources": [
36-
"go",
37-
"golang-version"
38-
],
39-
"groupName": "go packages"
25+
"groupName": "dependencies",
26+
"matchUpdateTypes": [
27+
"major",
28+
"minor",
29+
"patch",
30+
"pin",
31+
"digest"
32+
]
4033
}
41-
]
34+
],
35+
"separateMajorMinor": false
4236
}

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-08-05T10:23:31Z by kres faf91e3.
3+
# Generated on 2024-12-18T18:57:15Z by kres fcff05e.
44

55
name: default
66
concurrency:
@@ -77,7 +77,7 @@ jobs:
7777
run: |
7878
make unit-tests-race
7979
- name: coverage
80-
uses: codecov/codecov-action@v4
80+
uses: codecov/codecov-action@v5
8181
with:
8282
files: _out/coverage-unit-tests.txt
8383
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/slack-notify.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-03-05T05:52:53Z by kres latest.
3+
# Generated on 2024-12-18T18:57:15Z by kres fcff05e.
44

55
name: slack-notify
66
"on":
@@ -24,11 +24,12 @@ jobs:
2424
run: |
2525
echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT
2626
- name: Slack Notify
27-
uses: slackapi/slack-github-action@v1
27+
uses: slackapi/slack-github-action@v2
2828
with:
29-
channel-id: proj-talos-maintainers
29+
method: chat.postMessage
3030
payload: |
3131
{
32+
"channel": "proj-talos-maintainers",
3233
"attachments": [
3334
{
3435
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}",
@@ -88,5 +89,4 @@ jobs:
8889
}
8990
]
9091
}
91-
env:
92-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
92+
token: ${{ secrets.SLACK_BOT_TOKEN }}

‎.golangci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-08-05T10:23:31Z by kres faf91e3.
3+
# Generated on 2024-12-18T18:57:15Z by kres fcff05e.
44

55
# options for analysis running
66
run:
@@ -116,7 +116,6 @@ linters:
116116
- gochecknoglobals
117117
- gochecknoinits
118118
- godox
119-
- gomnd
120119
- gomoddirectives
121120
- gosec
122121
- inamedparam
@@ -135,6 +134,7 @@ linters:
135134
- perfsprint # complains about us using fmt.Sprintf in non-performance critical code, updating just kres took too long
136135
- goimports # same as gci
137136
- musttag # seems to be broken - goes into imported libraries and reports issues there
137+
- exportloopref # WARN The linter 'exportloopref' is deprecated (since v1.60.2) due to: Since Go1.22 (loopvar) this linter is no longer relevant. Replaced by copyloopvar.
138138

139139
issues:
140140
exclude: [ ]

‎.kres.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,13 @@ spec:
100100
enabled: true
101101
environment:
102102
REGISTRY: registry.dev.siderolabs.io
103+
---
104+
kind: common.Renovate
105+
spec:
106+
customManagers:
107+
- customType: regex
108+
fileMatch:
109+
- internal/pkg/constants/build.go
110+
matchStrings:
111+
- '\/\/\s+renovate: datasource=(?<datasource>.*?)(?:\s+extractVersion=(?<extractVersion>.+?))?(?:\s+versioning=(?<versioning>.+?))?\s+depName=(?<depName>.+?)?\s.*Image\s+=\s+\"docker.io\/alpine:(?<currentValue>.+?)\"'
112+
versioningTemplate: "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"

‎Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
# syntax = docker/dockerfile-upstream:1.10.0-labs
1+
# syntax = docker/dockerfile-upstream:1.12.1-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2024-10-02T14:48:15Z by kres 34e72ac.
5+
# Generated on 2024-12-18T18:57:15Z by kres fcff05e.
66

77
ARG TOOLCHAIN
88

9-
FROM ghcr.io/siderolabs/ca-certificates:v1.8.0 AS image-ca-certificates
9+
FROM ghcr.io/siderolabs/ca-certificates:v1.9.0 AS image-ca-certificates
1010

11-
FROM ghcr.io/siderolabs/fhs:v1.8.0 AS image-fhs
11+
FROM ghcr.io/siderolabs/fhs:v1.9.0 AS image-fhs
1212

1313
# runs markdownlint
14-
FROM docker.io/oven/bun:1.1.29-alpine AS lint-markdown
14+
FROM docker.io/oven/bun:1.1.40-alpine AS lint-markdown
1515
WORKDIR /src
16-
RUN bun i markdownlint-cli@0.41.0 sentences-per-line@0.2.1
16+
RUN bun i markdownlint-cli@0.43.0 sentences-per-line@0.3.0
1717
COPY .markdownlint.json .
1818
COPY ./CHANGELOG.md ./CHANGELOG.md
1919
COPY ./README.md ./README.md
20-
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .
20+
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules sentences-per-line .
2121

2222
# base toolchain image
2323
FROM --platform=${BUILDPLATFORM} ${TOOLCHAIN} AS toolchain

‎Makefile‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-10-02T14:48:15Z by kres 34e72ac.
3+
# Generated on 2024-12-18T18:57:15Z by kres fcff05e.
44

55
# common variables
66

@@ -17,15 +17,15 @@ WITH_RACE ?= false
1717
REGISTRY ?= ghcr.io
1818
USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.34.2
20+
PROTOBUF_GO_VERSION ?= 1.36.0
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.22.0
22+
GRPC_GATEWAY_VERSION ?= 2.24.0
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.25.0
24+
GOIMPORTS_VERSION ?= 0.28.0
2525
DEEPCOPY_VERSION ?= v0.5.6
26-
GOLANGCILINT_VERSION ?= v1.61.0
26+
GOLANGCILINT_VERSION ?= v1.62.2
2727
GOFUMPT_VERSION ?= v0.7.0
28-
GO_VERSION ?= 1.23.2
28+
GO_VERSION ?= 1.23.4
2929
GO_BUILDFLAGS ?=
3030
GO_LDFLAGS ?=
3131
CGO_ENABLED ?= 0
@@ -41,11 +41,13 @@ PLATFORM ?= linux/amd64
4141
PROGRESS ?= auto
4242
PUSH ?= false
4343
CI_ARGS ?=
44+
BUILDKIT_MULTI_PLATFORM ?= 1
4445
COMMON_ARGS = --file=Dockerfile
4546
COMMON_ARGS += --provenance=false
4647
COMMON_ARGS += --progress=$(PROGRESS)
4748
COMMON_ARGS += --platform=$(PLATFORM)
4849
COMMON_ARGS += --push=$(PUSH)
50+
COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM)
4951
COMMON_ARGS += --build-arg=ARTIFACTS="$(ARTIFACTS)"
5052
COMMON_ARGS += --build-arg=SHA="$(SHA)"
5153
COMMON_ARGS += --build-arg=TAG="$(TAG)"
@@ -149,9 +151,18 @@ target-%: ## Builds the specified target defined in the Dockerfile. The build r
149151

150152
local-%: ## Builds the specified target defined in the Dockerfile using the local output type. The build result will be output to the specified local destination.
151153
@$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)"
154+
@PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\
155+
for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
156+
echo $$platform; \
157+
directory="$${platform//\//_}"; \
158+
if [[ -d "$$DEST/$$directory" ]]; then \
159+
mv -f "$$DEST/$$directory/"* $$DEST; \
160+
rmdir "$$DEST/$$directory/"; \
161+
fi; \
162+
done'
152163

153164
generate: ## Generate .proto definitions.
154-
@$(MAKE) local-$@ DEST=./
165+
@$(MAKE) local-$@ DEST=./ BUILDKIT_MULTI_PLATFORM=0
155166

156167
lint-golangci-lint: ## Runs golangci-lint linter.
157168
@$(MAKE) target-$@

‎go.mod‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
module github.com/siderolabs/bldr
22

3-
go 1.22.3
3+
go 1.23.4
44

55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/Masterminds/sprig/v3 v3.3.0
88
github.com/containerd/platforms v0.2.1
9-
github.com/emicklei/dot v1.6.2
10-
github.com/google/go-github/v65 v65.0.0
9+
github.com/emicklei/dot v1.6.4
10+
github.com/google/go-github/v67 v67.0.0
1111
github.com/hashicorp/go-multierror v1.1.1
12-
github.com/moby/buildkit v0.16.0
12+
github.com/moby/buildkit v0.18.2
1313
github.com/moby/docker-image-spec v1.3.1
1414
github.com/opencontainers/go-digest v1.0.0
1515
github.com/opencontainers/image-spec v1.1.0
1616
github.com/otiai10/copy v1.14.0
17-
github.com/siderolabs/gen v0.5.0
17+
github.com/siderolabs/gen v0.8.0
1818
github.com/spf13/cobra v1.8.1
19-
github.com/stretchr/testify v1.9.0
20-
golang.org/x/oauth2 v0.23.0
21-
golang.org/x/sync v0.8.0
19+
github.com/stretchr/testify v1.10.0
20+
golang.org/x/oauth2 v0.24.0
21+
golang.org/x/sync v0.10.0
2222
gopkg.in/yaml.v3 v3.0.1
2323
)
2424

@@ -27,19 +27,16 @@ require (
2727
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
2828
github.com/Masterminds/goutils v1.1.1 // indirect
2929
github.com/Masterminds/semver/v3 v3.3.0 // indirect
30-
github.com/Microsoft/go-winio v0.6.2 // indirect
31-
github.com/containerd/containerd v1.7.21 // indirect
32-
github.com/containerd/continuity v0.4.3 // indirect
33-
github.com/containerd/errdefs v0.1.0 // indirect
30+
github.com/containerd/containerd v1.7.24 // indirect
31+
github.com/containerd/errdefs v0.3.0 // indirect
3432
github.com/containerd/log v0.1.0 // indirect
3533
github.com/containerd/ttrpc v1.2.5 // indirect
36-
github.com/containerd/typeurl/v2 v2.2.0 // indirect
34+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
3735
github.com/davecgh/go-spew v1.1.1 // indirect
3836
github.com/distribution/reference v0.6.0 // indirect
3937
github.com/felixge/httpsnoop v1.0.4 // indirect
40-
github.com/go-logr/logr v1.4.1 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
4139
github.com/go-logr/stdr v1.2.2 // indirect
42-
github.com/gogo/googleapis v1.4.1 // indirect
4340
github.com/gogo/protobuf v1.3.2 // indirect
4441
github.com/golang/protobuf v1.5.4 // indirect
4542
github.com/google/go-querystring v1.1.0 // indirect
@@ -49,33 +46,34 @@ require (
4946
github.com/huandu/xstrings v1.5.0 // indirect
5047
github.com/in-toto/in-toto-golang v0.5.0 // indirect
5148
github.com/inconshreveable/mousetrap v1.1.0 // indirect
52-
github.com/klauspost/compress v1.17.9 // indirect
49+
github.com/klauspost/compress v1.17.11 // indirect
5350
github.com/mitchellh/copystructure v1.2.0 // indirect
5451
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5552
github.com/moby/locker v1.0.1 // indirect
5653
github.com/moby/sys/signal v0.7.1 // indirect
5754
github.com/pkg/errors v0.9.1 // indirect
55+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
5856
github.com/pmezard/go-difflib v1.0.0 // indirect
5957
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
6058
github.com/shibumi/go-pathspec v1.3.0 // indirect
6159
github.com/shopspring/decimal v1.4.0 // indirect
6260
github.com/sirupsen/logrus v1.9.3 // indirect
6361
github.com/spf13/cast v1.7.0 // indirect
6462
github.com/spf13/pflag v1.0.5 // indirect
65-
github.com/tonistiigi/fsutil v0.0.0-20240424095704-91a3fc46842c // indirect
63+
github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 // indirect
6664
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
6765
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
68-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
69-
go.opentelemetry.io/otel v1.21.0 // indirect
70-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
71-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
72-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
73-
golang.org/x/crypto v0.26.0 // indirect
74-
golang.org/x/net v0.25.0 // indirect
75-
golang.org/x/sys v0.23.0 // indirect
76-
golang.org/x/text v0.17.0 // indirect
77-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
78-
google.golang.org/grpc v1.62.0 // indirect
79-
google.golang.org/protobuf v1.33.0 // indirect
66+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
67+
go.opentelemetry.io/otel v1.28.0 // indirect
68+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
69+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
70+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
71+
golang.org/x/crypto v0.27.0 // indirect
72+
golang.org/x/net v0.29.0 // indirect
73+
golang.org/x/sys v0.26.0 // indirect
74+
golang.org/x/text v0.18.0 // indirect
75+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
76+
google.golang.org/grpc v1.66.3 // indirect
77+
google.golang.org/protobuf v1.35.1 // indirect
8078
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8179
)

0 commit comments

Comments
 (0)