upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-05 06:42:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #133782 from aojea/lockDisableAllocatorDualWrite

Browse source 
lock DisableAllocatorDualWrite
This commit is contained in:
Kubernetes Prow Robot 2025-09-01 22:43:40 -07:00 committed by GitHub
commit cb163eb55b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/features/kube_features.go
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: {

4
test/compatibility_lifecycle/reference/versioned_feature_list.yaml
View file

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

8
test/integration/dualstack/dualstack_test.go
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,