mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 05:57:25 +00:00
Merge pull request #129713 from HirazawaUi/promote-DisableNodeKubeProxyVersion-to-default
Promote the DisableNodeKubeProxyVersion feature gate to be enabled by default
This commit is contained in:
commit
68b456b76f
@ -1105,6 +1105,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
|
|||||||
DisableNodeKubeProxyVersion: {
|
DisableNodeKubeProxyVersion: {
|
||||||
{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
|
{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
|
||||||
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated},
|
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated},
|
||||||
|
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Deprecated}, // lock to default in 1.34 and remove in v1.37
|
||||||
},
|
},
|
||||||
|
|
||||||
DRAAdminAccess: {
|
DRAAdminAccess: {
|
||||||
|
@ -296,7 +296,7 @@ func TestUpdateNewNodeStatus(t *testing.T) {
|
|||||||
Architecture: goruntime.GOARCH,
|
Architecture: goruntime.GOARCH,
|
||||||
ContainerRuntimeVersion: "test://1.5.0",
|
ContainerRuntimeVersion: "test://1.5.0",
|
||||||
KubeletVersion: version.Get().String(),
|
KubeletVersion: version.Get().String(),
|
||||||
KubeProxyVersion: version.Get().String(),
|
KubeProxyVersion: "",
|
||||||
},
|
},
|
||||||
Capacity: v1.ResourceList{
|
Capacity: v1.ResourceList{
|
||||||
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
||||||
@ -476,7 +476,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) {
|
|||||||
Architecture: goruntime.GOARCH,
|
Architecture: goruntime.GOARCH,
|
||||||
ContainerRuntimeVersion: "test://1.5.0",
|
ContainerRuntimeVersion: "test://1.5.0",
|
||||||
KubeletVersion: version.Get().String(),
|
KubeletVersion: version.Get().String(),
|
||||||
KubeProxyVersion: version.Get().String(),
|
KubeProxyVersion: "",
|
||||||
},
|
},
|
||||||
Capacity: v1.ResourceList{
|
Capacity: v1.ResourceList{
|
||||||
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
||||||
@ -682,7 +682,7 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) {
|
|||||||
Architecture: goruntime.GOARCH,
|
Architecture: goruntime.GOARCH,
|
||||||
ContainerRuntimeVersion: "test://1.5.0",
|
ContainerRuntimeVersion: "test://1.5.0",
|
||||||
KubeletVersion: version.Get().String(),
|
KubeletVersion: version.Get().String(),
|
||||||
KubeProxyVersion: version.Get().String(),
|
KubeProxyVersion: "",
|
||||||
},
|
},
|
||||||
Capacity: v1.ResourceList{
|
Capacity: v1.ResourceList{
|
||||||
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
||||||
@ -913,7 +913,7 @@ func TestUpdateNodeStatusWithLease(t *testing.T) {
|
|||||||
Architecture: goruntime.GOARCH,
|
Architecture: goruntime.GOARCH,
|
||||||
ContainerRuntimeVersion: "test://1.5.0",
|
ContainerRuntimeVersion: "test://1.5.0",
|
||||||
KubeletVersion: version.Get().String(),
|
KubeletVersion: version.Get().String(),
|
||||||
KubeProxyVersion: version.Get().String(),
|
KubeProxyVersion: "",
|
||||||
},
|
},
|
||||||
Capacity: v1.ResourceList{
|
Capacity: v1.ResourceList{
|
||||||
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
v1.ResourceCPU: *resource.NewMilliQuantity(2000, resource.DecimalSI),
|
||||||
|
@ -429,6 +429,10 @@
|
|||||||
lockToDefault: false
|
lockToDefault: false
|
||||||
preRelease: Deprecated
|
preRelease: Deprecated
|
||||||
version: "1.31"
|
version: "1.31"
|
||||||
|
- default: true
|
||||||
|
lockToDefault: false
|
||||||
|
preRelease: Deprecated
|
||||||
|
version: "1.33"
|
||||||
- name: DRAAdminAccess
|
- name: DRAAdminAccess
|
||||||
versionedSpecs:
|
versionedSpecs:
|
||||||
- default: false
|
- default: false
|
||||||
|
Loading…
Reference in New Issue
Block a user