github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of gengo InputDirs flag

Browse Source
This commit is contained in:
Tim Hockin 2024-01-16 18:32:44 -08:00
parent 299b045307
commit b68340e5b6
No known key found for this signature in database
12 changed files with 30 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hack/update-codegen.sh
View File

@ -179,7 +179,7 @@ function codegen::deepcopy() {
--go-header-file "${BOILERPLATE_FILENAME}" \
--output-file "${output_file}" \
--bounding-dirs "k8s.io/kubernetes,k8s.io/api" \
$(printf -- " -i %s" "${tag_pkgs[@]}") \
"${tag_pkgs[@]}" \
"$@"
if [[ "${DBG_CODEGEN}" == 1 ]]; then
@ -310,7 +310,7 @@ function codegen::prerelease() {
-v "${KUBE_VERBOSE}" \
--go-header-file "${BOILERPLATE_FILENAME}" \
--output-file "${output_file}" \
$(printf -- " -i %s" "${tag_pkgs[@]}") \
"${tag_pkgs[@]}" \
"$@"
if [[ "${DBG_CODEGEN}" == 1 ]]; then
@ -378,7 +378,7 @@ function codegen::defaults() {
-v "${KUBE_VERBOSE}" \
--go-header-file "${BOILERPLATE_FILENAME}" \
--output-file "${output_file}" \
$(printf -- " -i %s" "${tag_pkgs[@]}") \
"${tag_pkgs[@]}" \
"$@"
if [[ "${DBG_CODEGEN}" == 1 ]]; then
@ -458,7 +458,7 @@ function codegen::conversions() {
--go-header-file "${BOILERPLATE_FILENAME}" \
--output-file "${output_file}" \
$(printf -- " --extra-peer-dirs %s" "${extra_peer_pkgs[@]}") \
$(printf -- " -i %s" "${tag_pkgs[@]}") \
"${tag_pkgs[@]}" \
"$@"
if [[ "${DBG_CODEGEN}" == 1 ]]; then
@ -555,7 +555,7 @@ function codegen::openapi() {
--output-dir "${output_dir}" \
--output-pkg "${output_pkg}" \
--report-filename "${report_file}" \
$(printf -- " -i %s" "${tag_pkgs[@]}") \
"${tag_pkgs[@]}" \
"$@"
touch "${report_file}"
@ -610,7 +610,7 @@ function codegen::applyconfigs() {
--go-header-file "${BOILERPLATE_FILENAME}" \
--output-dir "${KUBE_ROOT}/staging/src/${APPLYCONFIG_PKG}" \
--output-pkg "${APPLYCONFIG_PKG}" \
$(printf -- " --input-dirs %s" "${ext_apis[@]}") \
"${ext_apis[@]}" \
"$@"
if [[ "${DBG_CODEGEN}" == 1 ]]; then
@ -708,7 +708,7 @@ function codegen::listers() {
--go-header-file "${BOILERPLATE_FILENAME}" \
--output-dir "${KUBE_ROOT}/staging/src/k8s.io/client-go/listers" \
--output-pkg "k8s.io/client-go/listers" \
$(printf -- " --input-dirs %s" "${ext_apis[@]}") \
"${ext_apis[@]}" \
"$@"
if [[ "${DBG_CODEGEN}" == 1 ]]; then
@ -753,7 +753,7 @@ function codegen::informers() {
--single-directory \
--versioned-clientset-package "k8s.io/client-go/kubernetes" \
--listers-package "k8s.io/client-go/listers" \
$(printf -- " --input-dirs %s" "${ext_apis[@]}") \
"${ext_apis[@]}" \
"$@"
if [[ "${DBG_CODEGEN}" == 1 ]]; then

1
staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/main.go
View File

@ -49,6 +49,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

4
staging/src/k8s.io/code-generator/cmd/client-gen/main.go
View File

@ -40,9 +40,10 @@ func main() {
pflag.Parse()
// add group version package as input dirs for gengo
inputPkgs := []string{}
for _, pkg := range customArgs.Groups {
for _, v := range pkg.Versions {
genericArgs.InputDirs = append(genericArgs.InputDirs, v.Package)
inputPkgs = append(inputPkgs, v.Package)
}
}
@ -55,6 +56,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
inputPkgs,
); err != nil {
klog.Fatalf("Error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go
View File

@ -125,6 +125,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go
View File

@ -75,6 +75,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go
View File

@ -71,6 +71,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/informer-gen/main.go
View File

@ -47,6 +47,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/lister-gen/main.go
View File

@ -47,6 +47,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/openapi-gen/main.go
View File

@ -51,6 +51,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
log.Fatalf("OpenAPI code generation error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/main.go
View File

@ -64,6 +64,7 @@ func main() {
statusgenerators.DefaultNameSystem(),
statusgenerators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

1
staging/src/k8s.io/code-generator/cmd/register-gen/main.go
View File

@ -43,6 +43,7 @@ func main() {
generators.DefaultNameSystem(),
generators.GetTargets,
args.StdBuildTag,
pflag.Args(),
); err != nil {
klog.Fatalf("Error: %v", err)
}

48
staging/src/k8s.io/code-generator/kube_codegen.sh
View File

@ -138,15 +138,11 @@ function kube::codegen::gen_helpers() {
-name zz_generated.deepcopy.go \
| xargs -0 rm -f
local input_args=()
for arg in "${input_pkgs[@]}"; do
input_args+=("--input-dirs" "$arg")
done
"${gobin}/deepcopy-gen" \
-v "${v}" \
--output-file zz_generated.deepcopy.go \
--go-header-file "${boilerplate}" \
"${input_args[@]}"
"${input_pkgs[@]}"
fi
# Defaults
@ -174,15 +170,11 @@ function kube::codegen::gen_helpers() {
-name zz_generated.defaults.go \
| xargs -0 rm -f
local input_args=()
for arg in "${input_pkgs[@]}"; do
input_args+=("--input-dirs" "$arg")
done
"${gobin}/defaulter-gen" \
-v "${v}" \
--output-file zz_generated.defaults.go \
--go-header-file "${boilerplate}" \
"${input_args[@]}"
"${input_pkgs[@]}"
fi
# Conversions
@ -210,10 +202,6 @@ function kube::codegen::gen_helpers() {
-name zz_generated.conversion.go \
| xargs -0 rm -f
local input_args=()
for arg in "${input_pkgs[@]}"; do
input_args+=("--input-dirs" "$arg")
done
local extra_peer_args=()
for arg in "${extra_peers[@]:+"${extra_peers[@]}"}"; do
extra_peer_args+=("--extra-peer-dirs" "$arg")
@ -223,7 +211,7 @@ function kube::codegen::gen_helpers() {
--output-file zz_generated.conversion.go \
--go-header-file "${boilerplate}" \
"${extra_peer_args[@]:+"${extra_peer_args[@]}"}" \
"${input_args[@]}"
"${input_pkgs[@]}"
fi
}
@ -367,10 +355,6 @@ function kube::codegen::gen_openapi() {
-name zz_generated.openapi.go \
| xargs -0 rm -f
local inputs=()
for arg in "${input_pkgs[@]}"; do
inputs+=("--input-dirs" "$arg")
done
"${gobin}/openapi-gen" \
-v "${v}" \
--output-file zz_generated.openapi.go \
@ -378,10 +362,10 @@ function kube::codegen::gen_openapi() {
--output-dir "${out_dir}" \
--output-pkg "${out_pkg}" \
--report-filename "${new_report}" \
--input-dirs "k8s.io/apimachinery/pkg/apis/meta/v1" \
--input-dirs "k8s.io/apimachinery/pkg/runtime" \
--input-dirs "k8s.io/apimachinery/pkg/version" \
"${inputs[@]}"
"k8s.io/apimachinery/pkg/apis/meta/v1" \
"k8s.io/apimachinery/pkg/runtime" \
"k8s.io/apimachinery/pkg/version" \
"${input_pkgs[@]}"
fi
touch "${report}" # in case it doesn't exist yet
@ -604,17 +588,13 @@ function kube::codegen::gen_client() {
|| true \
) | xargs -0 rm -f
local inputs=()
for arg in "${input_pkgs[@]}"; do
inputs+=("--input-dirs" "$arg")
done
"${gobin}/applyconfiguration-gen" \
-v "${v}" \
--go-header-file "${boilerplate}" \
--output-dir "${out_dir}/${applyconfig_subdir}" \
--output-pkg "${applyconfig_pkg}" \
--external-applyconfigurations "${applyconfig_external}" \
"${inputs[@]}"
"${input_pkgs[@]}"
fi
echo "Generating client code for ${#group_versions[@]} targets"
@ -651,17 +631,13 @@ function kube::codegen::gen_client() {
|| true \
) | xargs -0 rm -f
local inputs=()
for arg in "${input_pkgs[@]}"; do
inputs+=("--input-dirs" "$arg")
done
"${gobin}/lister-gen" \
-v "${v}" \
--go-header-file "${boilerplate}" \
--output-dir "${out_dir}/${listers_subdir}" \
--output-pkg "${out_pkg}/${listers_subdir}" \
--plural-exceptions "${plural_exceptions}" \
"${inputs[@]}"
"${input_pkgs[@]}"
echo "Generating informer code for ${#input_pkgs[@]} targets"
@ -672,10 +648,6 @@ function kube::codegen::gen_client() {
|| true \
) | xargs -0 rm -f
local inputs=()
for arg in "${input_pkgs[@]}"; do
inputs+=("--input-dirs" "$arg")
done
"${gobin}/informer-gen" \
-v "${v}" \
--go-header-file "${boilerplate}" \
@ -684,6 +656,6 @@ function kube::codegen::gen_client() {
--versioned-clientset-package "${out_pkg}/${clientset_subdir}/${clientset_versioned_name}" \
--listers-package "${out_pkg}/${listers_subdir}" \
--plural-exceptions "${plural_exceptions}" \
"${inputs[@]}"
"${input_pkgs[@]}"
fi
}