From 7ce54af8fce74a948c59dc8033d830b987e1ca76 Mon Sep 17 00:00:00 2001 From: weak-fox <827367480@qq.com> Date: Thu, 23 Apr 2026 14:07:35 +0800 Subject: [PATCH] code-generator: align models-schema stderr output --- pkg/generated/openapi/cmd/models-schema/main.go | 2 +- .../src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh | 3 +-- .../pkg/generated/openapi/cmd/models-schema/main.go | 2 +- .../pkg/generated/openapi/cmd/models-schema/main.go | 2 +- .../pkg/generated/openapi/cmd/models-schema/main.go | 2 +- .../pkg/generated/openapi/cmd/models-schema/main.go | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/generated/openapi/cmd/models-schema/main.go b/pkg/generated/openapi/cmd/models-schema/main.go index b20af94271d..8fb88fc0cf5 100644 --- a/pkg/generated/openapi/cmd/models-schema/main.go +++ b/pkg/generated/openapi/cmd/models-schema/main.go @@ -30,7 +30,7 @@ import ( func main() { err := output() if err != nil { - os.Stderr.WriteString(fmt.Sprintf("Failed: %v", err)) // nolint:errcheck + fmt.Fprintf(os.Stderr, "Failed: %v", err) // nolint:errcheck os.Exit(1) } } diff --git a/staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh index a4eca62a2cf..3868ac9520b 100755 --- a/staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh +++ b/staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh @@ -34,10 +34,9 @@ cleanup echo "Ensuring models-schema is up-to-date" K8S_MODELS_SCHEMA="${SCRIPT_ROOT}/../../../../pkg/generated/openapi/cmd/models-schema/main.go" APIEXTENSIONS_MODELS_SCHEMA="${SCRIPT_ROOT}/pkg/generated/openapi/cmd/models-schema/main.go" -# These files intentionally differ in import lines and the local lint-safe stderr write. +# These files intentionally differ in import lines. if ! diff -I "k8s.io/kubernetes/pkg/generated/openapi" \ -I "k8s.io/apiextensions-apiserver/pkg/generated/openapi" \ - -I "Failed: %v" \ "${K8S_MODELS_SCHEMA}" "${APIEXTENSIONS_MODELS_SCHEMA}"; then echo "${APIEXTENSIONS_MODELS_SCHEMA} is out of date. Compare changes with ${K8S_MODELS_SCHEMA}" exit 1 diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/cmd/models-schema/main.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/cmd/models-schema/main.go index 32d416652de..c68c49d4a9a 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/cmd/models-schema/main.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/generated/openapi/cmd/models-schema/main.go @@ -30,7 +30,7 @@ import ( func main() { err := output() if err != nil { - fmt.Fprintf(os.Stderr, "Failed: %v", err) //nolint:errcheck + fmt.Fprintf(os.Stderr, "Failed: %v", err) // nolint:errcheck os.Exit(1) } } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/cmd/models-schema/main.go b/staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/cmd/models-schema/main.go index cd412be30c7..695d3d4bbf0 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/cmd/models-schema/main.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/generated/openapi/cmd/models-schema/main.go @@ -30,7 +30,7 @@ import ( func main() { err := output() if err != nil { - os.Stderr.WriteString(fmt.Sprintf("Failed: %v", err)) // nolint:errcheck + fmt.Fprintf(os.Stderr, "Failed: %v", err) // nolint:errcheck os.Exit(1) } } diff --git a/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/cmd/models-schema/main.go b/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/cmd/models-schema/main.go index be85afe7e74..e6bf6cd0875 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/cmd/models-schema/main.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/generated/openapi/cmd/models-schema/main.go @@ -30,7 +30,7 @@ import ( func main() { err := output() if err != nil { - os.Stderr.WriteString(fmt.Sprintf("Failed: %v", err)) // nolint:errcheck + fmt.Fprintf(os.Stderr, "Failed: %v", err) // nolint:errcheck os.Exit(1) } } diff --git a/staging/src/k8s.io/sample-controller/pkg/generated/openapi/cmd/models-schema/main.go b/staging/src/k8s.io/sample-controller/pkg/generated/openapi/cmd/models-schema/main.go index 19113e47464..05801252df1 100644 --- a/staging/src/k8s.io/sample-controller/pkg/generated/openapi/cmd/models-schema/main.go +++ b/staging/src/k8s.io/sample-controller/pkg/generated/openapi/cmd/models-schema/main.go @@ -30,7 +30,7 @@ import ( func main() { err := output() if err != nil { - os.Stderr.WriteString(fmt.Sprintf("Failed: %v", err)) // nolint:errcheck + fmt.Fprintf(os.Stderr, "Failed: %v", err) // nolint:errcheck os.Exit(1) } }