Skip to content

OCPBUGS-71234: Permit z-stream upgrades when custom featureGates are enabled #6083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copejon wants to merge 3 commits into
base: main
Choose a base branch
from
Open

OCPBUGS-71234: Permit z-stream upgrades when custom featureGates are enabled #6083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
356938f
align featuregate upgrade blocking behavior by allowing only z-stream…
copejon Jan 14, 2026
a7668d1
revert logged instructions; tests now use minor version 21 and up for…
copejon Jan 16, 2026
e67c096
Apply suggestions from code review
copejon Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/admin/prerun/featuregate_lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func validateFeatureGateLockFile(cfg *config.Config) error {
return fmt.Errorf("failed to get current version: %w", err)
}

if lockFile.Version != currentVersion {
if lockFile.Version.Major != currentVersion.Major || lockFile.Version.Minor != currentVersion.Minor {
return fmt.Errorf("version upgrade detected with custom feature gates: locked version %s, current version %s\n\n"+
"Upgrades are not supported when custom feature gates are configured.\n"+
"Custom feature gates (%s) were configured in version %s.\n"+
Expand Down
145 changes: 100 additions & 45 deletions pkg/admin/prerun/featuregate_lock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,59 +393,114 @@ func TestFeatureGateLockManagement_ConfigChange(t *testing.T) {
}

func TestFeatureGateLockManagement_VersionChange(t *testing.T) {
// Create a temporary directory for testing
tmpDir, err := os.MkdirTemp("", "featuregate-lockFile-test-*")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir)

// Override the lockFile file path for testing
originalPath := featureGateLockFilePath
featureGateLockFilePath = filepath.Join(tmpDir, "no-upgrade")
defer func() { featureGateLockFilePath = originalPath }()

// Override version file path for testing
originalVersionPath := versionFilePath
versionFilePath = filepath.Join(tmpDir, "version")
defer func() { versionFilePath = originalVersionPath }()

// Create a version file with NEW version (simulating upgrade) (version file uses JSON format)
versionData := versionFile{
Version: versionMetadata{Major: 4, Minor: 19, Patch: 0}, // Newer version
BootID: "test-boot",
}
versionJSON, _ := json.Marshal(versionData)
if err := os.WriteFile(versionFilePath, versionJSON, 0600); err != nil {
t.Fatal(err)
}

// Create lockFile file with OLD version
lockFile := featureGateLockFile{
FeatureSet: config.FeatureSetCustomNoUpgrade,
CustomNoUpgrade: config.CustomNoUpgrade{
Enabled: []string{"FeatureA"},
tests := []struct {
name string
lockFileVer versionMetadata
currentVer versionMetadata
wantErr bool
description string
}{
{
name: "minor version upgrade should fail",
lockFileVer: versionMetadata{Major: 4, Minor: 21, Patch: 0},
currentVer: versionMetadata{Major: 4, Minor: 22, Patch: 0},
wantErr: true,
description: "Minor version upgrade (4.21.0 -> 4.22.0) should be blocked",
},
{
name: "major version upgrade should fail",
lockFileVer: versionMetadata{Major: 4, Minor: 21, Patch: 0},
currentVer: versionMetadata{Major: 5, Minor: 0, Patch: 0},
wantErr: true,
description: "Major version upgrade (4.21.0 -> 5.0.0) should be blocked",
},
{
name: "patch version change should succeed",
lockFileVer: versionMetadata{Major: 4, Minor: 21, Patch: 0},
currentVer: versionMetadata{Major: 4, Minor: 21, Patch: 1},
wantErr: false,
description: "Patch version change (4.21.0 -> 4.21.1) should be allowed",
},
{
name: "same version should succeed",
lockFileVer: versionMetadata{Major: 4, Minor: 21, Patch: 0},
currentVer: versionMetadata{Major: 4, Minor: 21, Patch: 0},
wantErr: false,
description: "Same version (4.21.0 -> 4.21.0) should be allowed",
},
{
name: "minor version downgrade should fail",
lockFileVer: versionMetadata{Major: 4, Minor: 22, Patch: 0},
currentVer: versionMetadata{Major: 4, Minor: 21, Patch: 0},
wantErr: true,
description: "Minor version downgrade (4.22.0 -> 4.21.0) should be blocked",
},
{
name: "major version downgrade should fail",
lockFileVer: versionMetadata{Major: 5, Minor: 0, Patch: 0},
currentVer: versionMetadata{Major: 4, Minor: 21, Patch: 0},
wantErr: true,
description: "Major version downgrade (5.0.0 -> 4.21.0) should be blocked",
},
Version: versionMetadata{Major: 4, Minor: 18, Patch: 0}, // Older version
}
if err := writeFeatureGateLockFile(featureGateLockFilePath, lockFile); err != nil {
t.Fatal(err)
}

cfg := &config.Config{
ApiServer: config.ApiServer{
FeatureGates: config.FeatureGates{
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
// Create a temporary directory for testing
tmpDir, err := os.MkdirTemp("", "featuregate-lockFile-test-*")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir)

// Override the lockFile file path for testing
originalPath := featureGateLockFilePath
featureGateLockFilePath = filepath.Join(tmpDir, "no-upgrade")
defer func() { featureGateLockFilePath = originalPath }()

// Override version file path for testing
originalVersionPath := versionFilePath
versionFilePath = filepath.Join(tmpDir, "version")
defer func() { versionFilePath = originalVersionPath }()

// Create a version file with current version (version file uses JSON format)
versionData := versionFile{
Version: tt.currentVer,
BootID: "test-boot",
}
versionJSON, _ := json.Marshal(versionData)
if err := os.WriteFile(versionFilePath, versionJSON, 0600); err != nil {
t.Fatal(err)
}

// Create lockFile file with locked version
lockFile := featureGateLockFile{
FeatureSet: config.FeatureSetCustomNoUpgrade,
CustomNoUpgrade: config.CustomNoUpgrade{
Enabled: []string{"FeatureA"},
},
},
},
}
Version: tt.lockFileVer,
}
if err := writeFeatureGateLockFile(featureGateLockFilePath, lockFile); err != nil {
t.Fatal(err)
}

err = FeatureGateLockManagement(cfg)
if err == nil {
t.Error("FeatureGateLockManagement() should have failed with version change")
cfg := &config.Config{
ApiServer: config.ApiServer{
FeatureGates: config.FeatureGates{
FeatureSet: config.FeatureSetCustomNoUpgrade,
CustomNoUpgrade: config.CustomNoUpgrade{
Enabled: []string{"FeatureA"},
},
},
},
}

err = FeatureGateLockManagement(cfg)
if (err != nil) != tt.wantErr {
t.Errorf("FeatureGateLockManagement() error = %v, wantErr %v. %s", err, tt.wantErr, tt.description)
}
})
}
}

Expand Down