Skip to content

Commit f1b3fdf

Browse files
authored
Merge pull request kubernetes#129500 from carlory/PDBUnhealthyPodEvictionPolicy
Remove general available feature-gate PDBUnhealthyPodEvictionPolicy
2 parents 38fab70 + 7513147 commit f1b3fdf

File tree

13 files changed

+6
-47
lines changed

13 files changed

+6
-47
lines changed

api/openapi-spec/swagger.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/openapi-spec/v3/apis__policy__v1_openapi.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/policy/types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ type PodDisruptionBudgetSpec struct {
6464
// Additional policies may be added in the future.
6565
// Clients making eviction decisions should disallow eviction of unhealthy pods
6666
// if they encounter an unrecognized policy in this field.
67-
//
68-
// This field is beta-level. The eviction API uses this field when
69-
// the feature gate PDBUnhealthyPodEvictionPolicy is enabled (enabled by default).
7067
// +optional
7168
UnhealthyPodEvictionPolicy *UnhealthyPodEvictionPolicyType
7269
}

pkg/features/kube_features.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,6 @@ const (
455455
// Permits kubelet to run with swap enabled.
456456
NodeSwap featuregate.Feature = "NodeSwap"
457457

458-
// owner: @mortent, @atiratree, @ravig
459-
// kep: http://kep.k8s.io/3018
460-
//
461-
// Enables PDBUnhealthyPodEvictionPolicy for PodDisruptionBudgets
462-
PDBUnhealthyPodEvictionPolicy featuregate.Feature = "PDBUnhealthyPodEvictionPolicy"
463-
464458
// owner: @RomanBednar
465459
// kep: https://kep.k8s.io/3762
466460
//

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -566,12 +566,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
566566
{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.Beta},
567567
},
568568

569-
PDBUnhealthyPodEvictionPolicy: {
570-
{Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha},
571-
{Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta},
572-
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33
573-
},
574-
575569
PersistentVolumeLastPhaseTransitionTime: {
576570
{Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Alpha},
577571
{Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.Beta},

pkg/generated/openapi/zz_generated.openapi.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/policy/v1/generated.proto

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/api/policy/v1/types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ type PodDisruptionBudgetSpec struct {
7070
// Additional policies may be added in the future.
7171
// Clients making eviction decisions should disallow eviction of unhealthy pods
7272
// if they encounter an unrecognized policy in this field.
73-
//
74-
// This field is beta-level. The eviction API uses this field when
75-
// the feature gate PDBUnhealthyPodEvictionPolicy is enabled (enabled by default).
7673
// +optional
7774
UnhealthyPodEvictionPolicy *UnhealthyPodEvictionPolicyType `json:"unhealthyPodEvictionPolicy,omitempty" protobuf:"bytes,4,opt,name=unhealthyPodEvictionPolicy"`
7875
}

0 commit comments

Comments
 (0)