Skip to content

Commit a20e0c2

Browse files
authored
chore: renovate fix controller-gen (#68)
Signed-off-by: Marco Nenciarini <[email protected]>
1 parent 9151fdb commit a20e0c2

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

controller-gen/main.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,15 @@ type ControllerGen struct {
2727
}
2828

2929
func New(
30-
// ControllerGen to use.
30+
// ControllerGen to use.
3131
// +optional
32-
// renovate image: datasource=github-tags depName=kubernetes-sigs/controller-tools versioning=semver
33-
// renovate: datasource=github-tags depName=protocolbuffers/protobuf versioning="regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)$"
32+
// renovate: datasource=github-tags depName=kubernetes-sigs/controller-tools versioning=semver
3433
// +default="0.16.2"
3534
controllerGenVersion string,
3635
// +optional
3736
// renovate image: datasource=docker depName=golang versioning=docker
38-
// +default="1.23.1"
39-
golangVersion string,
37+
// +default="golang:1.24.0-bookworm"
38+
goImage string,
4039
// +optional
4140
ctr *dagger.Container,
4241
) *ControllerGen {
@@ -46,7 +45,7 @@ func New(
4645
}
4746
}
4847
return &ControllerGen{
49-
Ctr: dag.Container().From(fmt.Sprintf("golang:%v", golangVersion)).
48+
Ctr: dag.Container().From(goImage).
5049
WithExec([]string{"go", "install",
5150
fmt.Sprintf("sigs.k8s.io/controller-tools/cmd/controller-gen@v%v", controllerGenVersion)}),
5251
}

renovate.json5

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,7 @@
2626
],
2727
matchStrings: [
2828
'\\/\\/ renovate image: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (?:lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?\\s+\\/\\/\\s+\\+default=["\']?[^:]+:(?<currentValue>.+?)["\']?\\s',
29-
],
30-
},
31-
{
32-
customType: 'regex',
33-
fileMatch: [
34-
'(^protoc-gen-go-grpc/dagger/main\\.go$)',
35-
],
36-
matchStrings: [
37-
'\\/\\/ renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?\\s+\\/\\/\\s+\\+default=["\']?(?<currentValue>.+?)["\']?\\s',
29+
'\\/\\/ renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?\\s+\\/\\/\\s+\\+default=["\']?(?<currentValue>.+?)["\']?\\s'
3830
],
3931
},
4032
{

0 commit comments

Comments
 (0)