Merge pull request #100108 from Jefftree/ssa-revertga

Revert SSA GA

Kubernetes-commit: 98d3738f6d3e140d193bb3fc5384d93b92fbd562
This commit is contained in:
Kubernetes Publisher 2021-03-10 22:43:04 -08:00
commit 3c3275ad0c
1 changed files with 1 additions and 2 deletions

View File

@ -95,7 +95,6 @@ const (
// owner: @apelisse, @lavalamp
// alpha: v1.14
// beta: v1.16
// stable: v1.21
//
// Server-side apply. Merging happens on the server.
ServerSideApply featuregate.Feature = "ServerSideApply"
@ -179,7 +178,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
APIListChunking: {Default: true, PreRelease: featuregate.Beta},
DryRun: {Default: true, PreRelease: featuregate.GA},
RemainingItemCount: {Default: true, PreRelease: featuregate.Beta},
ServerSideApply: {Default: true, PreRelease: featuregate.GA},
ServerSideApply: {Default: true, PreRelease: featuregate.Beta},
StorageVersionHash: {Default: true, PreRelease: featuregate.Beta},
StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha},
WatchBookmark: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},