github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #58878 from liggitt/deprecated-feature

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Categorize deprecated feature gate more accurately

related to #58761

follow up from https://github.com/kubernetes/kubernetes/pull/57265 to clarify the status of the feature gate

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-27 12:40:45 -08:00 committed by GitHub
commit e8225f5618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/features/kube_features.go
View File

@ -170,7 +170,7 @@ const (
ServiceNodeExclusion utilfeature.Feature = "ServiceNodeExclusion" ServiceNodeExclusion utilfeature.Feature = "ServiceNodeExclusion"
// owner @brendandburns // owner @brendandburns
// stable: v1.10 // deprecated: v1.10
// //
// Enable the service proxy to contact external IP addresses. Note this feature is present // Enable the service proxy to contact external IP addresses. Note this feature is present
// only for backward compatability, it will be removed in the 1.11 release. // only for backward compatability, it will be removed in the 1.11 release.
@ -284,6 +284,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
// unintentionally on either side: // unintentionally on either side:
apiextensionsfeatures.CustomResourceValidation: {Default: true, PreRelease: utilfeature.Beta}, apiextensionsfeatures.CustomResourceValidation: {Default: true, PreRelease: utilfeature.Beta},
// backward compatability features that enable backwards compatability but should be removed soon. // features that enable backwards compatability but are scheduled to be removed
ServiceProxyAllowExternalIPs: {Default: false, PreRelease: utilfeature.Beta}, ServiceProxyAllowExternalIPs: {Default: false, PreRelease: utilfeature.Deprecated},
} }

8
staging/src/k8s.io/apiserver/pkg/util/feature/feature_gate.go
View File

@ -67,6 +67,9 @@ const (
Alpha = prerelease("ALPHA") Alpha = prerelease("ALPHA")
Beta = prerelease("BETA") Beta = prerelease("BETA")
GA = prerelease("") GA = prerelease("")
// Deprecated
Deprecated = prerelease("DEPRECATED")
) )
// FeatureGate parses and stores flag gates for known features from // FeatureGate parses and stores flag gates for known features from
@ -157,7 +160,7 @@ func (f *featureGate) Set(value string) error {
} }
arr := strings.SplitN(s, "=", 2) arr := strings.SplitN(s, "=", 2)
k := Feature(strings.TrimSpace(arr[0])) k := Feature(strings.TrimSpace(arr[0]))
_, ok := known[k] featureSpec, ok := known[k]
if !ok { if !ok {
return fmt.Errorf("unrecognized key: %s", k) return fmt.Errorf("unrecognized key: %s", k)
} }
@ -170,6 +173,9 @@ func (f *featureGate) Set(value string) error {
return fmt.Errorf("invalid value of %s: %s, err: %v", k, v, err) return fmt.Errorf("invalid value of %s: %s, err: %v", k, v, err)
} }
enabled[k] = boolValue enabled[k] = boolValue
if boolValue && featureSpec.PreRelease == Deprecated {
glog.Warningf("enabling deprecated feature gate %s", k)
}
// Handle "special" features like "all alpha gates" // Handle "special" features like "all alpha gates"
if fn, found := f.special[k]; found { if fn, found := f.special[k]; found {