From a2bf91e9cffa69af3a839e9b911ceed54cad165a Mon Sep 17 00:00:00 2001 From: Siyuan Zhang Date: Wed, 16 Oct 2024 11:14:22 -0700 Subject: [PATCH] add instructions into verify-featuregates script. Signed-off-by: Siyuan Zhang --- hack/verify-featuregates.sh | 5 ++++- test/featuregates_linter/cmd/feature_gates.go | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/hack/verify-featuregates.sh b/hack/verify-featuregates.sh index 6aaf748ad1e..17512d81a51 100755 --- a/hack/verify-featuregates.sh +++ b/hack/verify-featuregates.sh @@ -28,4 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" cd "${KUBE_ROOT}" -go run test/featuregates_linter/main.go feature-gates verify +if ! go run test/featuregates_linter/main.go feature-gates verify; then + echo "Please run 'hack/update-featuregates.sh' to update the feature list." + exit 1 +fi diff --git a/test/featuregates_linter/cmd/feature_gates.go b/test/featuregates_linter/cmd/feature_gates.go index efe53eab45a..4c37b3ec8e2 100644 --- a/test/featuregates_linter/cmd/feature_gates.go +++ b/test/featuregates_linter/cmd/feature_gates.go @@ -96,19 +96,23 @@ func NewUpdateFeatureListCommand() *cobra.Command { func verifyFeatureListFunc(cmd *cobra.Command, args []string) { if err := verifyOrUpdateFeatureList(k8RootPath, unversionedFeatureListFile, false, false); err != nil { - panic(err) + fmt.Fprintf(os.Stderr, "Failed to verify feature list: \n%s", err) + os.Exit(1) } if err := verifyOrUpdateFeatureList(k8RootPath, versionedFeatureListFile, false, true); err != nil { - panic(err) + fmt.Fprintf(os.Stderr, "Failed to verify versioned feature list: \n%s", err) + os.Exit(1) } } func updateFeatureListFunc(cmd *cobra.Command, args []string) { if err := verifyOrUpdateFeatureList(k8RootPath, unversionedFeatureListFile, true, false); err != nil { - panic(err) + fmt.Fprintf(os.Stderr, "Failed to update feature list: \n%s", err) + os.Exit(1) } if err := verifyOrUpdateFeatureList(k8RootPath, versionedFeatureListFile, true, true); err != nil { - panic(err) + fmt.Fprintf(os.Stderr, "Failed to update versioned feature list: \n%s", err) + os.Exit(1) } }