diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index d560845401c..bb6371e0e72 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -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: { diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml index b24905fe8c4..bb33d1ffc85 100644 --- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml +++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml @@ -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 diff --git a/test/integration/dualstack/dualstack_test.go b/test/integration/dualstack/dualstack_test.go index ef6363be00d..f6a75e860ad 100644 --- a/test/integration/dualstack/dualstack_test.go +++ b/test/integration/dualstack/dualstack_test.go @@ -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,