mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-25 11:31:44 +00:00
Merge pull request #126759 from mcluseau/fix-err-fg-linter
feategates_linter: take versioned into account in the error message
This commit is contained in:
commit
8486ed0620
@ -167,7 +167,11 @@ func verifyOrUpdateFeatureList(rootPath, featureListFile string, update, version
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user