lock DisableAllocatorDualWrite

This commit is contained in:
Antonio Ojea
2025-08-29 11:43:56 +00:00
parent c9cc8c1ea8
commit 8a6f173652
3 changed files with 10 additions and 5 deletions

View File

@@ -1231,7 +1231,8 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
DisableAllocatorDualWrite: {
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
{Version: version.MustParse("1.33"), Default: false, PreRelease: featuregate.Beta},
{Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA}, // remove after MultiCIDRServiceAllocator is GA
{Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA},
{Version: version.MustParse("1.35"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove after MultiCIDRServiceAllocator is GA
},
DisableCPUQuotaWithExclusiveCPUs: {

View File

@@ -427,6 +427,10 @@
lockToDefault: false
preRelease: GA
version: "1.34"
- default: true
lockToDefault: true
preRelease: GA
version: "1.35"
- name: DisableCPUQuotaWithExclusiveCPUs
versionedSpecs:
- default: true

View File

@@ -56,7 +56,7 @@ func TestCreateServiceSingleStackIPv4(t *testing.T) {
"--disable-admission-plugins=ServiceAccount",
fmt.Sprintf("--feature-gates=%s=%v,%s=%v", features.MultiCIDRServiceAllocator, enableMultiServiceCIDR, features.DisableAllocatorDualWrite, disableAllocatorDualWrite),
}
if !enableMultiServiceCIDR {
if !enableMultiServiceCIDR || !disableAllocatorDualWrite {
flags = append(flags, "--emulated-version=1.33")
}
s := kubeapiservertesting.StartTestServerOrDie(t,
@@ -303,7 +303,7 @@ func TestCreateServiceSingleStackIPv6(t *testing.T) {
"--disable-admission-plugins=ServiceAccount",
fmt.Sprintf("--feature-gates=%s=%v,%s=%v", features.MultiCIDRServiceAllocator, enableMultiServiceCIDR, features.DisableAllocatorDualWrite, disableAllocatorDualWrite),
}
if !enableMultiServiceCIDR {
if !enableMultiServiceCIDR || !disableAllocatorDualWrite {
flags = append(flags, "--emulated-version=1.33")
}
s := kubeapiservertesting.StartTestServerOrDie(t,
@@ -537,7 +537,7 @@ func TestCreateServiceDualStackIPv4IPv6(t *testing.T) {
"--disable-admission-plugins=ServiceAccount",
fmt.Sprintf("--feature-gates=%s=%v,%s=%v", features.MultiCIDRServiceAllocator, enableMultiServiceCIDR, features.DisableAllocatorDualWrite, disableAllocatorDualWrite),
}
if !enableMultiServiceCIDR {
if !enableMultiServiceCIDR || !disableAllocatorDualWrite {
flags = append(flags, "--emulated-version=1.33")
}
s := kubeapiservertesting.StartTestServerOrDie(t,
@@ -819,7 +819,7 @@ func TestCreateServiceDualStackIPv6IPv4(t *testing.T) {
"--disable-admission-plugins=ServiceAccount",
fmt.Sprintf("--feature-gates=%s=%v,%s=%v", features.MultiCIDRServiceAllocator, enableMultiServiceCIDR, features.DisableAllocatorDualWrite, disableAllocatorDualWrite),
}
if !enableMultiServiceCIDR {
if !enableMultiServiceCIDR || !disableAllocatorDualWrite {
flags = append(flags, "--emulated-version=1.33")
}
s := kubeapiservertesting.StartTestServerOrDie(t,