mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-06-10 17:35:44 -04:00
Merge pull request #138537 from weak-fox/followup-126850-models-schema
code-generator: align models-schema stderr output
This commit is contained in:
commit
fde453b60e
6 changed files with 6 additions and 7 deletions
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue