mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-18 08:09:58 +00:00
featuregates_linter: take versioned into account in the error message
This commit is contained in:
parent
e9c9a27c97
commit
0c71a42be1
@ -167,7 +167,11 @@ func verifyOrUpdateFeatureList(rootPath, featureListFile string, update, version
|
|||||||
}
|
}
|
||||||
|
|
||||||
if diff := cmp.Diff(featureList, baseFeatureList); diff != "" {
|
if diff := cmp.Diff(featureList, baseFeatureList); diff != "" {
|
||||||
return fmt.Errorf("detected diff in unversioned feature list, diff: \n%s", diff)
|
if versioned {
|
||||||
|
return fmt.Errorf("detected diff in versioned feature list (%s), diff: \n%s", versionedFeatureListFile, diff)
|
||||||
|
} else {
|
||||||
|
return fmt.Errorf("detected diff in unversioned feature list (%s), diff: \n%s", unversionedFeatureListFile, diff)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user