Skip to content

Commit 740564a

Browse files
haoqing0110claude
andauthored
chore: upgrade Go version to 1.25 (#84)
🤖 Generated with [Claude Code](https://claude.ai/code) Signed-off-by: Qing Hao <qhao@redhat.com> Co-authored-by: Claude <noreply@anthropic.com>
1 parent 28a3fb8 commit 740564a

11 files changed

Lines changed: 23 additions & 17 deletions

.github/workflows/go-postsubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
# Common versions
11-
GO_VERSION: '1.24'
11+
GO_VERSION: '1.25'
1212
GO_REQUIRED_MIN_VERSION: ''
1313
GOPATH: '/home/runner/work/cluster-permission/cluster-permission/go'
1414
defaults:

.github/workflows/go-presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
# Common versions
11-
GO_VERSION: '1.24'
11+
GO_VERSION: '1.25'
1212
GO_REQUIRED_MIN_VERSION: ''
1313
GOPATH: '/home/runner/work/cluster-permission/cluster-permission/go'
1414
defaults:

.github/workflows/go-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'v*.*.*'
77
env:
88
# Common versions
9-
GO_VERSION: '1.22'
9+
GO_VERSION: '1.25'
1010
GO_REQUIRED_MIN_VERSION: ''
1111
GITHUB_REF: ${{ github.ref }}
1212
CHART_NAME: cluster-permission

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/stolostron/builder:go1.24-linux AS builder
1+
FROM registry.ci.openshift.org/stolostron/builder:go1.25-linux AS builder
22

33
WORKDIR /go/src/github.com/open-cluster-management-io/cluster-permission
44
COPY . .

Dockerfile.rhtap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 AS plugin-builder
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 AS plugin-builder
22

33
WORKDIR /go/src/github.com/open-cluster-management-io/cluster-permission
44
COPY . .

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
143143

144144
## Tool Versions
145145
KUSTOMIZE_VERSION ?= v3.8.7
146-
CONTROLLER_TOOLS_VERSION ?= v0.16.0
146+
CONTROLLER_TOOLS_VERSION ?= v0.17.1
147147

148148
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
149149
.PHONY: kustomize

config/crds/rbac.open-cluster-management.io_clusterpermissions.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.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: clusterpermissions.rbac.open-cluster-management.io
88
spec:
99
group: rbac.open-cluster-management.io

config/rbac/role.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,9 @@ rules:
6666
- patch
6767
- update
6868
- watch
69+
- apiGroups:
70+
- work.open-cluster-management.io
71+
resources:
72+
- manifestworks/status
73+
verbs:
74+
- get

controllers/clusterpermission_status_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,10 +1583,10 @@ func TestReconcileEdgeCases(t *testing.T) {
15831583
trueVal := true
15841584

15851585
cases := []struct {
1586-
name string
1587-
manifestWork *workv1.ManifestWork
1586+
name string
1587+
manifestWork *workv1.ManifestWork
15881588
clusterPermission *cpv1alpha1.ClusterPermission
1589-
expectError bool
1589+
expectError bool
15901590
}{
15911591
{
15921592
name: "ManifestWork with no owner reference",

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module open-cluster-management.io/cluster-permission
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
66
github.com/go-logr/logr v1.4.2
@@ -54,15 +54,15 @@ require (
5454
go.uber.org/multierr v1.11.0 // indirect
5555
go.uber.org/zap v1.26.0 // indirect
5656
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
57-
golang.org/x/mod v0.17.0 // indirect
57+
golang.org/x/mod v0.22.0 // indirect
5858
golang.org/x/net v0.38.0 // indirect
5959
golang.org/x/oauth2 v0.27.0 // indirect
6060
golang.org/x/sync v0.12.0 // indirect
6161
golang.org/x/sys v0.31.0 // indirect
6262
golang.org/x/term v0.30.0 // indirect
6363
golang.org/x/text v0.23.0 // indirect
6464
golang.org/x/time v0.5.0 // indirect
65-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
65+
golang.org/x/tools v0.29.0 // indirect
6666
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6767
google.golang.org/protobuf v1.34.2 // indirect
6868
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect

0 commit comments

Comments
 (0)