github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130878 from yongruilin/compatibility-version-featuregate

Browse Source 
feat: Add alpha feature verification to feature gates
This commit is contained in:
Kubernetes Prow Robot 2025-03-18 05:25:49 -07:00 committed by GitHub
commit 8559194e11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/compatibility_lifecycle/cmd/feature_gates.go
View File

@ -134,6 +134,10 @@ func verifyOrUpdateFeatureList(rootPath, featureListFile string, currentVersion
}
featureList = append(featureList, features...)
if err := verifyAlphaFeatures(featureList); err != nil {
return err
}
sort.Slice(featureList, func(i, j int) bool {
return strings.ToLower(featureList[i].Name) < strings.ToLower(featureList[j].Name)
})
@ -175,7 +179,7 @@ func verifyOrUpdateFeatureList(rootPath, featureListFile string, currentVersion
}
func dedupeFeatureList(featureList []featureInfo) ([]featureInfo, error) {
if featureList == nil || len(featureList) < 1 {
if len(featureList) < 1 {
return featureList, nil
}
last := featureList[0]
@ -262,6 +266,17 @@ func verifyFeatureRemoval(featureList []featureInfo, baseFeatureList []featureIn
return nil
}
func verifyAlphaFeatures(featureList []featureInfo) error {
for _, f := range featureList {
for _, spec := range f.VersionedSpecs {
if spec.PreRelease == "Alpha" && spec.Default {
return fmt.Errorf("alpha feature %s cannot be enabled by default", f.Name)
}
}
}
return nil
}
func searchPathForFeatures(path string) ([]featureInfo, error) {
allFeatures := []featureInfo{}
// Create a FileSet to work with

50
test/compatibility_lifecycle/cmd/feature_gates_test.go
View File

@ -894,3 +894,53 @@ func TestVerifyFeatureRemoval(t *testing.T) {
})
}
}
func TestVerifyAlphaFeatures(t *testing.T) {
tests := []struct {
name string
featureList []featureInfo
expectErr bool
expectedErrMsg string
}{
{
name: "no alpha features",
featureList: []featureInfo{
{Name: "FeatureB", VersionedSpecs: []featureSpec{{Version: "1.0", PreRelease: "Beta"}}},
{Name: "FeatureC", VersionedSpecs: []featureSpec{{Version: "1.0", PreRelease: "GA", LockToDefault: true}}},
},
},
{
name: "alpha feature disabled",
featureList: []featureInfo{
{Name: "FeatureA", VersionedSpecs: []featureSpec{{Version: "1.0", PreRelease: "Alpha", Default: false}}},
{Name: "FeatureB", VersionedSpecs: []featureSpec{{Version: "1.0", PreRelease: "Beta"}}},
},
},
{
name: "alpha feature enabled",
featureList: []featureInfo{
{Name: "FeatureA", VersionedSpecs: []featureSpec{{Version: "1.0", PreRelease: "Alpha", Default: true}}},
{Name: "FeatureB", VersionedSpecs: []featureSpec{{Version: "1.0", PreRelease: "Beta"}}},
},
expectErr: true,
expectedErrMsg: "alpha feature FeatureA cannot be enabled by default",
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
err := verifyAlphaFeatures(tc.featureList)
if tc.expectErr {
if err == nil {
t.Fatalf("expected error, got nil")
}
if !strings.Contains(err.Error(), tc.expectedErrMsg) {
t.Fatalf("expected error message to contain %q, got %q", tc.expectedErrMsg, err.Error())
}
return
}
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
})
}
}