Merge pull request #5111 from RainbowMango/pr_switch_openapi_generator

karmada-bot · web-flow · commit 00a2b77f7cf0 · 2024-07-04T10:49:59.000+08:00
Switch openapi-gen from k8s.io/code-generator to k8s.io/kube-openapi
diff --git a/hack/tools/tools.go b/hack/tools/tools.go
@@ -25,4 +25,5 @@ import (
 	_ "go.uber.org/mock/mockgen"
 	_ "golang.org/x/tools/cmd/goimports"
 	_ "k8s.io/code-generator"
+	_ "k8s.io/kube-openapi/cmd/openapi-gen"
 )
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -28,7 +28,7 @@ GO111MODULE=on go install k8s.io/code-generator/cmd/conversion-gen
 GO111MODULE=on go install k8s.io/code-generator/cmd/client-gen
 GO111MODULE=on go install k8s.io/code-generator/cmd/lister-gen
 GO111MODULE=on go install k8s.io/code-generator/cmd/informer-gen
-GO111MODULE=on go install k8s.io/code-generator/cmd/openapi-gen
+GO111MODULE=on go install k8s.io/kube-openapi/cmd/openapi-gen
 export GOPATH=$(go env GOPATH | awk -F ':' '{print $1}')
 export PATH=$PATH:$GOPATH/bin
 
diff --git a/vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go b/vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1643,6 +1643,7 @@ k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
 k8s.io/kube-aggregator/pkg/registry/apiservice/rest
 # k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
 ## explicit; go 1.19
+k8s.io/kube-openapi/cmd/openapi-gen
 k8s.io/kube-openapi/cmd/openapi-gen/args
 k8s.io/kube-openapi/pkg/aggregator
 k8s.io/kube-openapi/pkg/builder

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,5 @@ import (`
`25`	`25`	`_ "go.uber.org/mock/mockgen"`
`26`	`26`	`_ "golang.org/x/tools/cmd/goimports"`
`27`	`27`	`_ "k8s.io/code-generator"`
	`28`	`+ _ "k8s.io/kube-openapi/cmd/openapi-gen"`
`28`	`29`	`)`