Skip to content

Commit e9a01e9

Browse files
xuezhaojunclaude
andcommitted
Upgrade Go to 1.24 and hive/apis to latest master
- Update Go version from 1.23 to 1.24 in Dockerfiles - Upgrade github.com/openshift/hive/apis to v0.0.0-20251125223338-67352652fb30 - Update k8s.io dependencies to v0.33.3 - Add vendor directory to version control - Run go mod tidy and go mod vendor 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]> Signed-off-by: xuezhaojun <[email protected]>
1 parent 72be166 commit e9a01e9

File tree

9,260 files changed

+2547425
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,260 files changed

+2547425
-79
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
.vscode
66
.idea
77

8-
vendor
9-
108
# Files
119
OPENSOURCE.check
1210
.DS_Store

.tekton/managedcluster-import-controller-addon-mce-28-pull-request.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ metadata:
1818
namespace: crt-redhat-acm-tenant
1919
spec:
2020
params:
21-
- name: hermetic
22-
value: "true"
23-
- name: prefetch-input
24-
value: '{"type": "gomod", "path": "."}'
2521
- name: git-url
2622
value: '{{source_url}}'
2723
- name: revision

.tekton/managedcluster-import-controller-addon-mce-28-push.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ metadata:
1717
namespace: crt-redhat-acm-tenant
1818
spec:
1919
params:
20-
- name: hermetic
21-
value: "true"
22-
- name: prefetch-input
23-
value: '{"type": "gomod", "path": "."}'
2420
- name: git-url
2521
value: '{{source_url}}'
2622
- name: revision

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ check: check-copyright lint
4949
check-copyright:
5050
@build/check-copyright.sh
5151

52-
GOLANGCI_LINT_VERSION = v1.63.4
52+
GOLANGCI_LINT_VERSION = v2.3.1
5353
TOOLS_DIR = $(PWD)/_output
5454
GOLANGCI_LINT = $(TOOLS_DIR)/golangci-lint
5555

build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright Contributors to the Open Cluster Management project
22

3-
FROM registry.ci.openshift.org/stolostron/builder:go1.23-linux AS builder
3+
FROM registry.ci.openshift.org/stolostron/builder:go1.24-linux AS builder
44

55
ENV REMOTE_SOURCE='.'
66
ENV REMOTE_SOURCE_DIR='/remote-source'

build/Dockerfile.rhtap

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Copyright Contributors to the Open Cluster Management project
22

3-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.23 AS builder
3+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.24 AS builder
44

55
ENV REMOTE_SOURCE='.'
66
ENV REMOTE_SOURCE_DIR='/remote-source'
77

88
COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR/app/
99
WORKDIR $REMOTE_SOURCE_DIR/app
10-
11-
RUN go build -mod=readonly -o $REMOTE_SOURCE_DIR/app/manager ./cmd/manager
10+
RUN BUILD_OUTPUT_DIR=${REMOTE_SOURCE_DIR}/app make build
1211

1312
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
1413
LABEL \

go.mod

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/stolostron/managedcluster-import-controller
22

3-
go 1.23.6
3+
go 1.24.0
44

55
// TODO: @xuezhaojun need to switch to the official flightctl lib once it's ready.
66
replace github.com/flightctl/flightctl/lib => github.com/xuezhaojun/flightctl/lib v0.0.0-20241125124411-7eec33f53a61
@@ -9,25 +9,25 @@ require (
99
github.com/flightctl/flightctl/lib v0.0.0
1010
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
1111
github.com/go-logr/logr v1.4.2
12-
github.com/google/go-cmp v0.6.0
12+
github.com/google/go-cmp v0.7.0
1313
github.com/onsi/ginkgo/v2 v2.22.0
1414
github.com/onsi/gomega v1.36.0
15-
github.com/openshift/api v0.0.0-20240919193929-2669d1ebc910
15+
github.com/openshift/api v0.0.0-20250313134101-8a7efbfb5316
1616
github.com/openshift/assisted-service/api v0.0.0
17-
github.com/openshift/hive/apis v0.0.0-20250212001559-5d3f4d77dc90
17+
github.com/openshift/hive/apis v0.0.0-20251125223338-67352652fb30
1818
github.com/openshift/library-go v0.0.0-20240207105404-126b47137408 // https://github.com/openshift/library-go/tree/release-4.14
19-
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
19+
github.com/spf13/pflag v1.0.6
2020
github.com/stolostron/cluster-lifecycle-api v0.0.0-20240918064238-a5e71b599118
2121
go.uber.org/zap v1.27.0
22-
golang.org/x/text v0.23.0
23-
k8s.io/api v0.32.1
22+
golang.org/x/text v0.31.0
23+
k8s.io/api v0.33.3
2424
k8s.io/apiextensions-apiserver v0.32.1
25-
k8s.io/apimachinery v0.32.1
25+
k8s.io/apimachinery v0.33.3
2626
k8s.io/apiserver v0.32.1
2727
k8s.io/client-go v0.32.1
2828
k8s.io/component-base v0.32.1
2929
k8s.io/klog/v2 v2.130.1
30-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
30+
k8s.io/utils v0.0.0-20241210054802-24370beab758
3131
open-cluster-management.io/api v0.14.1-0.20250708065710-54efb2e2ae7b
3232
sigs.k8s.io/controller-runtime v0.19.3
3333
)
@@ -38,7 +38,7 @@ require (
3838
github.com/openshift-online/ocm-sdk-go v0.1.392
3939
github.com/openshift/hypershift/api v0.0.0-20241022184855-1fa7be0211e4
4040
github.com/sethvargo/go-password v0.2.0
41-
github.com/stretchr/testify v1.9.0
41+
github.com/stretchr/testify v1.10.0
4242
sigs.k8s.io/cluster-api v1.9.3
4343
sigs.k8s.io/yaml v1.4.0
4444
)
@@ -76,8 +76,7 @@ require (
7676
github.com/gogo/protobuf v1.3.2 // indirect
7777
github.com/golang/glog v1.2.4 // indirect
7878
github.com/golang/protobuf v1.5.4 // indirect
79-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
80-
github.com/google/gofuzz v1.2.0 // indirect
79+
github.com/google/gnostic-models v0.6.9 // indirect
8180
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
8281
github.com/google/uuid v1.6.0 // indirect
8382
github.com/gorilla/css v1.0.0 // indirect
@@ -127,26 +126,27 @@ require (
127126
go.opentelemetry.io/otel v1.28.0 // indirect
128127
go.opentelemetry.io/otel/trace v1.28.0 // indirect
129128
go.uber.org/multierr v1.11.0 // indirect
130-
golang.org/x/crypto v0.36.0 // indirect
129+
golang.org/x/crypto v0.44.0 // indirect
131130
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
132-
golang.org/x/net v0.33.0 // indirect
131+
golang.org/x/net v0.47.0 // indirect
133132
golang.org/x/oauth2 v0.28.0 // indirect
134-
golang.org/x/sys v0.31.0 // indirect
135-
golang.org/x/term v0.30.0 // indirect
136-
golang.org/x/time v0.7.0 // indirect
137-
golang.org/x/tools v0.26.0 // indirect
133+
golang.org/x/sys v0.38.0 // indirect
134+
golang.org/x/term v0.37.0 // indirect
135+
golang.org/x/time v0.9.0 // indirect
136+
golang.org/x/tools v0.38.0 // indirect
138137
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
139-
google.golang.org/protobuf v1.35.1 // indirect
138+
google.golang.org/protobuf v1.36.5 // indirect
140139
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
141140
gopkg.in/inf.v0 v0.9.1 // indirect
142141
gopkg.in/yaml.v2 v2.4.0 // indirect
143142
gopkg.in/yaml.v3 v3.0.1 // indirect
144143
gorm.io/gorm v1.24.5 // indirect
145144
k8s.io/kube-aggregator v0.29.0 // indirect
146-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
147-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
145+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
146+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
148147
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
149-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
148+
sigs.k8s.io/randfill v1.0.0 // indirect
149+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
150150
)
151151

152152
// hive/apis depends on openshift/installer depends these required openshift/assisted-service pkgs

0 commit comments

Comments
 (0)