Skip to content

Commit b869a81

Browse files
bschaatsbergenbschaatsbergen
authored
chore: bump to go 1.25.0 and bump controller-gen to v0.19.0 (#800)
* fix: pin to the golangci-lint version we use Signed-off-by: Bruno Schaatsbergen <[email protected]> * chore: bump controller-gen to v0.19.0 Signed-off-by: Bruno Schaatsbergen <[email protected]> * chore: bump to go 1.25.0 Signed-off-by: Bruno Schaatsbergen <[email protected]> * chore: pin toolchain to latest 1.25 patch Signed-off-by: Bruno Schaatsbergen <[email protected]> * chore: set the GOTOOLCHAIN to force the toolchain defined in go.mod Signed-off-by: Bruno Schaatsbergen <[email protected]> --------- Signed-off-by: Bruno Schaatsbergen <[email protected]>
1 parent 187d6f8 commit b869a81

19 files changed

+45
-27
lines changed

‎Makefile‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@ KO_PUSH ?= true
1010
KO_LOCAL ?= true
1111
export KIND_CLUSTER_NAME ?= kro
1212

13+
# Adapted from etcd-operator and k/k:
14+
# Set the GOTOOLCHAIN to force the toolchain defined in go.mod
15+
GOTOOLCHAIN ?= auto
16+
ifeq (auto,$(GOTOOLCHAIN)) # User didn't specify the GOTOOLCHAIN, or is set to auto.
17+
ifeq (,$(FORCE_HOST_GO)) # User didn't provide FORCE_HOST_GO, use go.mod's toolchain
18+
export GOTOOLCHAIN=$(shell grep '^toolchain go' go.mod | cut -d' ' -f2)
19+
else # User provided FORCE_HOST_GO, use the local version
20+
export GOTOOLCHAIN=local
21+
endif
22+
endif
23+
1324
GIT_TAG ?= dirty-tag
1425
GIT_VERSION ?= $(shell git describe --tags --always --dirty)
1526
GIT_HASH ?= $(shell git rev-parse HEAD)
@@ -113,7 +124,7 @@ else
113124
endif
114125

115126
GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
116-
GOLANGCI_LINT_VERSION ?= v1.64.5
127+
GOLANGCI_LINT_VERSION ?= v2.6.1
117128
golangci-lint:
118129
@[ -f $(GOLANGCI_LINT) ] || { \
119130
set -e ;\
@@ -157,7 +168,7 @@ CHAINSAW ?= $(LOCALBIN)/chainsaw
157168
## Tool Versions
158169
KO_VERSION ?= v0.17.1
159170
KUSTOMIZE_VERSION ?= v5.2.1
160-
CONTROLLER_TOOLS_VERSION ?= v0.16.2
171+
CONTROLLER_TOOLS_VERSION ?= v0.19.0
161172
CHAINSAW_VERSION ?= v0.2.12
162173

163174
.PHONY: chainsaw

‎cmd/kro/go.mod‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/kro-run/kro/cmd/kro
22

3-
go 1.24.0
3+
go 1.25.0
4+
5+
toolchain go1.25.4
46

57
require (
68
github.com/go-echarts/go-echarts/v2 v2.6.5

‎config/crd/bases/kro.run_resourcegraphdefinitions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.2
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: resourcegraphdefinitions.kro.run
88
spec:
99
group: kro.run

‎examples/aws/ack-controller/crds/ecr-crd-group.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
kind: CustomResourceDefinition
1717
metadata:
1818
annotations:
19-
controller-gen.kubebuilder.io/version: v0.16.2
19+
controller-gen.kubebuilder.io/version: v0.19.0
2020
name: repositories.ecr.services.k8s.aws
2121
spec:
2222
group: ecr.services.k8s.aws
@@ -222,7 +222,7 @@ spec:
222222
kind: CustomResourceDefinition
223223
metadata:
224224
annotations:
225-
controller-gen.kubebuilder.io/version: v0.16.2
225+
controller-gen.kubebuilder.io/version: v0.19.0
226226
name: pullthroughcacherules.ecr.services.k8s.aws
227227
spec:
228228
group: ecr.services.k8s.aws

‎examples/aws/ack-controller/crds/ecr-public-crd-group.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
kind: CustomResourceDefinition
1717
metadata:
1818
annotations:
19-
controller-gen.kubebuilder.io/version: v0.16.2
19+
controller-gen.kubebuilder.io/version: v0.19.0
2020
name: repositories.ecrpublic.services.k8s.aws
2121
spec:
2222
group: ecrpublic.services.k8s.aws

‎examples/aws/ack-controller/crds/eks-crd-group.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
kind: CustomResourceDefinition
1717
metadata:
1818
annotations:
19-
controller-gen.kubebuilder.io/version: v0.16.2
19+
controller-gen.kubebuilder.io/version: v0.19.0
2020
name: accessentries.eks.services.k8s.aws
2121
spec:
2222
group: eks.services.k8s.aws
@@ -280,7 +280,7 @@ spec:
280280
kind: CustomResourceDefinition
281281
metadata:
282282
annotations:
283-
controller-gen.kubebuilder.io/version: v0.16.2
283+
controller-gen.kubebuilder.io/version: v0.19.0
284284
name: addons.eks.services.k8s.aws
285285
spec:
286286
group: eks.services.k8s.aws
@@ -599,7 +599,7 @@ spec:
599599
kind: CustomResourceDefinition
600600
metadata:
601601
annotations:
602-
controller-gen.kubebuilder.io/version: v0.16.2
602+
controller-gen.kubebuilder.io/version: v0.19.0
603603
name: clusters.eks.services.k8s.aws
604604
spec:
605605
group: eks.services.k8s.aws
@@ -1035,7 +1035,7 @@ spec:
10351035
kind: CustomResourceDefinition
10361036
metadata:
10371037
annotations:
1038-
controller-gen.kubebuilder.io/version: v0.16.2
1038+
controller-gen.kubebuilder.io/version: v0.19.0
10391039
name: fargateprofiles.eks.services.k8s.aws
10401040
spec:
10411041
group: eks.services.k8s.aws
@@ -1286,7 +1286,7 @@ spec:
12861286
kind: CustomResourceDefinition
12871287
metadata:
12881288
annotations:
1289-
controller-gen.kubebuilder.io/version: v0.16.2
1289+
controller-gen.kubebuilder.io/version: v0.19.0
12901290
name: identityproviderconfigs.eks.services.k8s.aws
12911291
spec:
12921292
group: eks.services.k8s.aws
@@ -1463,7 +1463,7 @@ spec:
14631463
kind: CustomResourceDefinition
14641464
metadata:
14651465
annotations:
1466-
controller-gen.kubebuilder.io/version: v0.16.2
1466+
controller-gen.kubebuilder.io/version: v0.19.0
14671467
name: nodegroups.eks.services.k8s.aws
14681468
spec:
14691469
group: eks.services.k8s.aws
@@ -1936,7 +1936,7 @@ spec:
19361936
kind: CustomResourceDefinition
19371937
metadata:
19381938
annotations:
1939-
controller-gen.kubebuilder.io/version: v0.16.2
1939+
controller-gen.kubebuilder.io/version: v0.19.0
19401940
name: podidentityassociations.eks.services.k8s.aws
19411941
spec:
19421942
group: eks.services.k8s.aws

‎examples/aws/ack-controller/crds/s3-crd-group.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
kind: CustomResourceDefinition
1717
metadata:
1818
annotations:
19-
controller-gen.kubebuilder.io/version: v0.16.2
19+
controller-gen.kubebuilder.io/version: v0.19.0
2020
name: buckets.s3.services.k8s.aws
2121
spec:
2222
group: s3.services.k8s.aws

‎examples/aws/ack-controller/crds/sqs-crd-group.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
kind: CustomResourceDefinition
1717
metadata:
1818
annotations:
19-
controller-gen.kubebuilder.io/version: v0.16.2
19+
controller-gen.kubebuilder.io/version: v0.19.0
2020
name: queues.sqs.services.k8s.aws
2121
spec:
2222
group: sqs.services.k8s.aws

‎go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/kubernetes-sigs/kro
22

3-
go 1.24.0
3+
go 1.25.0
4+
5+
toolchain go1.25.4
46

57
require (
68
github.com/go-logr/logr v1.4.2
@@ -26,6 +28,7 @@ require (
2628
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2729
sigs.k8s.io/controller-runtime v0.19.0
2830
sigs.k8s.io/release-utils v0.11.0
31+
sigs.k8s.io/yaml v1.6.0
2932
)
3033

3134
require (
@@ -97,7 +100,6 @@ require (
97100
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
98101
sigs.k8s.io/randfill v1.0.0 // indirect
99102
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
100-
sigs.k8s.io/yaml v1.6.0 // indirect
101103
)
102104

103105
tool github.com/B1NARY-GR0UP/nwa

‎helm/crds/kro.run_resourcegraphdefinitions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.2
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: resourcegraphdefinitions.kro.run
88
spec:
99
group: kro.run

0 commit comments

Comments
 (0)