github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make update-codegen openapi work on gengo/v2

Browse Source
This commit is contained in:
Tim Hockin
2023-12-27 12:12:45 -08:00
parent 5475797f43
commit 1965f56f59
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hack/update-codegen.sh
View File

@@ -496,7 +496,7 @@ function k8s_tag_files_except() {
# // +k8s:openapi-gen=true # // +k8s:openapi-gen=true
function codegen::openapi() { function codegen::openapi() {
# Build the tool. # Build the tool.
GO111MODULE=on GOPROXY=off go install \ GOPROXY=off go install \
k8s.io/code-generator/cmd/openapi-gen k8s.io/code-generator/cmd/openapi-gen
# The result file, in each pkg, of open-api generation. # The result file, in each pkg, of open-api generation.
@@ -507,6 +507,7 @@ function codegen::openapi() {
gen_openapi_bin="$(kube::util::find-binary "openapi-gen")" gen_openapi_bin="$(kube::util::find-binary "openapi-gen")"
local output_dir="pkg/generated/openapi" local output_dir="pkg/generated/openapi"
local output_pkg="k8s.io/kubernetes/${output_dir}"
local known_violations_file="${API_KNOWN_VIOLATIONS_DIR}/violation_exceptions.list" local known_violations_file="${API_KNOWN_VIOLATIONS_DIR}/violation_exceptions.list"
local report_file="${OUT_DIR}/api_violations.report" local report_file="${OUT_DIR}/api_violations.report"
@@ -523,8 +524,8 @@ function codegen::openapi() {
local tag_files=() local tag_files=()
kube::util::read-array tag_files < <( kube::util::read-array tag_files < <(
k8s_tag_files_except \ k8s_tag_files_except \
vendor/k8s.io/code-generator \ staging/src/k8s.io/code-generator \
vendor/k8s.io/sample-apiserver staging/src/k8s.io/sample-apiserver
) )
local tag_dirs=() local tag_dirs=()
@@ -539,7 +540,7 @@ function codegen::openapi() {
local tag_pkgs=() local tag_pkgs=()
for dir in "${tag_dirs[@]}"; do for dir in "${tag_dirs[@]}"; do
tag_pkgs+=("${PRJ_SRC_PATH}/$dir") tag_pkgs+=("./$dir")
done done
kube::log::status "Generating openapi code" kube::log::status "Generating openapi code"
@@ -552,12 +553,13 @@ function codegen::openapi() {
git_find -z ':(glob)pkg/generated/**'/"${output_file}.go" | xargs -0 rm -f git_find -z ':(glob)pkg/generated/**'/"${output_file}.go" | xargs -0 rm -f
./hack/run-in-gopath.sh "${gen_openapi_bin}" \ "${gen_openapi_bin}" \
--v "${KUBE_VERBOSE}" \ --v "${KUBE_VERBOSE}" \
--logtostderr \ --logtostderr \
--go-header-file "${BOILERPLATE_FILENAME}" \ --go-header-file "${BOILERPLATE_FILENAME}" \
--output-file-base "${output_file}" \ --output-file-base "${output_file}" \
--output-package "${PRJ_SRC_PATH}/${output_dir}" \ --output-base "${output_dir}" \
--output-package "${output_pkg}" \
--report-filename "${report_file}" \ --report-filename "${report_file}" \
$(printf -- " -i %s" "${tag_pkgs[@]}") \ $(printf -- " -i %s" "${tag_pkgs[@]}") \
"$@" "$@"