Merge pull request #50559 from xiangpengzhao/remove-depre-flag

Automatic merge from submit-queue (batch tested with PRs 51244, 50559, 49770, 51194, 50901) Remove deprecated flag "long-running-request-regexp". **What this PR does / why we need it**: remove `long-running-request-regexp` post-1.6. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #50559 from xiangpengzhao/remove-depre-flag
05294d80 · Kubernetes Submit Queue · GitHub · 69187e06 · 72f4ab70 · 05294d80
Commit 05294d80 authored Aug 25, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

server_run_options.go ...k8s.io/apiserver/pkg/server/options/server_run_options.go +0 -6

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/server_run_options.go
@@ -120,12 +120,6 @@ func (s *ServerRunOptions) AddUniversalFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.ExternalHost, "external-hostname", s.ExternalHost,
 		"The hostname to use when generating externalized URLs for this master (e.g. Swagger API Docs).")
-	// TODO: remove post-1.6
-	fs.String("long-running-request-regexp", "", ""+
-		"A regular expression matching long running requests which should "+
-		"be excluded from maximum inflight request handling.")
-	fs.MarkDeprecated("long-running-request-regexp", "regular expression matching of long-running requests is no longer supported")
 	deprecatedMasterServiceNamespace := metav1.NamespaceDefault
 	fs.StringVar(&deprecatedMasterServiceNamespace, "master-service-namespace", deprecatedMasterServiceNamespace, ""+
 		"DEPRECATED: the namespace from which the kubernetes master services should be injected into pods.")