Skip to content

generate clientset with 1.35 code-generator #4347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rueian merged 3 commits into from
Jan 13, 2026
Merged

generate clientset with 1.35 code-generator #4347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9860e3
generate clientset with 1.35 code-generator
KunWuLuan Jan 6, 2026
f201498
Update codegen script to use go list for k8s.io/code-generator path r…
KunWuLuan Jan 7, 2026
ca446c4
Run make sync
KunWuLuan Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ray-operator/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ require (
go.uber.org/mock v0.6.0
go.uber.org/zap v1.27.1
gopkg.in/natefinch/lumberjack.v2 v2.2.1
k8s.io/api v0.34.3
k8s.io/apimachinery v0.34.3
k8s.io/api v0.35.0
k8s.io/apimachinery v0.35.0
k8s.io/apiserver v0.34.3
k8s.io/client-go v0.34.3
k8s.io/code-generator v0.34.3
k8s.io/client-go v0.35.0
k8s.io/code-generator v0.35.0
k8s.io/component-base v0.34.3
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
Expand Down Expand Up @@ -76,7 +76,6 @@ require (
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.4 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
github.com/stretchr/objx v0.5.3 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions ray-operator/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ray-operator/hack/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ import (
_ "k8s.io/code-generator/cmd/defaulter-gen"
_ "k8s.io/code-generator/cmd/informer-gen"
_ "k8s.io/code-generator/cmd/lister-gen"
_ "k8s.io/code-generator/cmd/validation-gen"
)
4 changes: 2 additions & 2 deletions ray-operator/hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ export GOPATH

SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
ROOT_PKG=github.com/ray-project/kuberay/ray-operator
CODEGEN_PKG=$(go list -m -f "{{.Dir}}" k8s.io/code-generator)
CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
Copy link
Member

@win5923 win5923 Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain the reason for this change?

Copy link
Contributor Author

@KunWuLuan KunWuLuan Jan 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go vendor is enabled in my environment, and $(go list -m -f "{{.Dir}}" k8s.io/code-generator) return "" when go vendor is enabled. I have rollbacked this change.

Copy link
Member

@win5923 win5923 Jan 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh cool, I think we can create an issue for go vendor users.

Copy link
Member

@win5923 win5923 Jan 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#4352


if [[ ! -d ${CODEGEN_PKG} ]]; then
echo "${CODEGEN_PKG} is missing. Running 'go mod download'."
go mod download
CODEGEN_PKG=$(go list -m -f "{{.Dir}}" k8s.io/code-generator)
CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
fi

echo ">> Using ${CODEGEN_PKG}"
Expand Down
5 changes: 5 additions & 0 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/authoptions.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 34 additions & 10 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/autoscaleroptions.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/clusterupgradeoptions.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 14 additions & 2 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/deletioncondition.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/deletionpolicy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion ray-operator/pkg/client/applyconfiguration/ray/v1/deletionrule.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 29 additions & 3 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/deletionstrategy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/gcsfaulttoleranceoptions.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 20 additions & 7 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/headgroupspec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/headinfo.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions ray-operator/pkg/client/applyconfiguration/ray/v1/raycluster.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading