Skip to content

Commit 1bdc4b4

Browse files
authored
fix: update go 1.25, fix envtest (#370)
1 parent f436751 commit 1bdc4b4

5 files changed

Lines changed: 12 additions & 11 deletions

File tree

.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@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Setup Go
5757
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.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@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2
@@ -90,7 +90,7 @@ jobs:
9090
- name: Setup Go
9191
uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.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@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.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

.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@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0
2626
with:
27-
go-version: '1.24.6'
27+
go-version: '1.25.x'
2828
- name: Docker Login
2929
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
3030
with:

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
121121
CONTROLLER_GEN = $(GOBIN)/controller-gen
122122
.PHONY: controller-gen
123123
controller-gen: ## Download controller-gen locally if necessary.
124-
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1)
124+
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.20.0)
125+
#cp config/base/crd/bases/* chart/apollo-controller/crds/
125126

126127
GOLANGCI_LINT = $(GOBIN)/golangci-lint
127128
.PHONY: golangci-lint
@@ -136,7 +137,7 @@ kustomize: ## Download kustomize locally if necessary.
136137
ENVTEST = $(GOBIN)/setup-envtest
137138
.PHONY: envtest
138139
envtest: ## Download envtest-setup locally if necessary.
139-
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.17)
140+
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.22)
140141

141142
# go-install-tool will 'go install' any package $2 and install it to $1
142143
define go-install-tool

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/gc-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)