Skip to content

Commit 4eb366c

Browse files
authored
fix: update go 1.25, fix envtest (#225)
1 parent 59e504a commit 4eb366c

File tree

9 files changed

+921
-143
lines changed

9 files changed

+921
-143
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2222
with:
23-
go-version: 1.24.x
23+
go-version: 1.25.x
2424
- name: Tests
2525
run: make test
2626
- name: Send go coverage report

.github/workflows/pr-build.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Setup Go
5757
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5858
with:
59-
go-version: 1.24.x
59+
go-version: 1.25.x
6060
- name: fmt
6161
run: make fmt
6262
- name: vet
@@ -76,10 +76,10 @@ jobs:
7676
strategy:
7777
matrix:
7878
kubernetes-version:
79-
- "1.27"
80-
- "1.28"
81-
- "1.29"
8279
- "1.30"
80+
- "1.31"
81+
- "1.32"
82+
- "1.33"
8383
steps:
8484
- name: Harden Runner
8585
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -90,7 +90,7 @@ jobs:
9090
- name: Setup Go
9191
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
9292
with:
93-
go-version: 1.24.x
93+
go-version: 1.25.x
9494
- name: run test
9595
run: make test ENVTEST_K8S_VERSION=${{ matrix.kubernetes-version }}
9696

@@ -108,7 +108,7 @@ jobs:
108108
- name: Setup Go
109109
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
110110
with:
111-
go-version: 1.24.x
111+
go-version: 1.25.x
112112
- name: build
113113
run: make build
114114
- name: Check if working tree is dirty
@@ -153,7 +153,7 @@ jobs:
153153
- name: Setup Go
154154
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
155155
with:
156-
go-version: 1.24.x
156+
go-version: 1.25.x
157157
- name: Setup Kubernetes
158158
uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 #v0.5.0
159159
with:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2626
with:
27-
go-version: 1.24.x
27+
go-version: 1.25.x
2828
- name: Docker Login
2929
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
3030
with:

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ kind-test: ## Deploy including test
133133
CONTROLLER_GEN = $(GOBIN)/controller-gen
134134
.PHONY: controller-gen
135135
controller-gen: ## Download controller-gen locally if necessary.
136-
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1)
137-
#cp config/base/crd/bases/* chart/ratelimit-controller/crds/
136+
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.20.0)
137+
#cp config/base/crd/bases/* chart/apollo-controller/crds/
138138

139139
GOLANGCI_LINT = $(GOBIN)/golangci-lint
140140
.PHONY: golangci-lint
@@ -149,7 +149,7 @@ kustomize: ## Download kustomize locally if necessary.
149149
ENVTEST = $(GOBIN)/setup-envtest
150150
.PHONY: envtest
151151
envtest: ## Download envtest-setup locally if necessary.
152-
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.17)
152+
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.22)
153153

154154
# go-install-tool will 'go install' any package $2 and install it to $1.
155155
define go-install-tool

chart/ratelimit-controller/crds/ratelimit.infra.doodle.com_ratelimitrules.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.1
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: ratelimitrules.ratelimit.infra.doodle.com
88
spec:
99
group: ratelimit.infra.doodle.com

chart/ratelimit-controller/crds/ratelimit.infra.doodle.com_ratelimitservices.yaml

Lines changed: 453 additions & 64 deletions
Large diffs are not rendered by default.

config/base/crd/bases/ratelimit.infra.doodle.com_ratelimitrules.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.1
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
name: ratelimitrules.ratelimit.infra.doodle.com
88
spec:
99
group: ratelimit.infra.doodle.com

config/base/crd/bases/ratelimit.infra.doodle.com_ratelimitservices.yaml

Lines changed: 453 additions & 64 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/DoodleScheduling/ratelimit-controller
22

3-
go 1.24.2
3+
go 1.25.0
44

55
require (
66
github.com/fluxcd/pkg/runtime v0.80.0

0 commit comments

Comments
 (0)