Merge pull request #60875 from charrywanganthony/rm_ServiceAcountKeyFile

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>. remove --service-account-private-key-file in v1.11 `kube-cloud-controller-manager` flag `--service-account-private-key-file` is removed in v1.11 ref: #50289 **Release note**: ```release-note `kube-cloud-controller-manager` flag `--service-account-private-key-file` is removed in v1.11 ```

Merge pull request #60875 from charrywanganthony/rm_ServiceAcountKeyFile
d9008e08 · Kubernetes Submit Queue · GitHub · ab639118 · 95f99bf3 · d9008e08
Unverified Commit d9008e08 authored Mar 20, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

options.go cmd/cloud-controller-manager/app/options/options.go +0 -3

No files found.
--- a/cmd/cloud-controller-manager/app/options/options.go
+++ b/cmd/cloud-controller-manager/app/options/options.go
@@ -66,9 +66,6 @@ func (o *CloudControllerManagerOptions) AddFlags(fs *pflag.FlagSet) {

 	fs.StringVar(&o.Generic.ComponentConfig.CloudProvider, "cloud-provider", o.Generic.ComponentConfig.CloudProvider, "The provider of cloud services. Cannot be empty.")
 	fs.DurationVar(&o.NodeStatusUpdateFrequency.Duration, "node-status-update-frequency", o.NodeStatusUpdateFrequency.Duration, "Specifies how often the controller updates nodes' status.")
-	// TODO: remove --service-account-private-key-file 6 months after 1.8 is released (~1.10)
-	fs.StringVar(&o.Generic.ComponentConfig.ServiceAccountKeyFile, "service-account-private-key-file", o.Generic.ComponentConfig.ServiceAccountKeyFile, "Filename containing a PEM-encoded private RSA or ECDSA key used to sign service account tokens.")
-	fs.MarkDeprecated("service-account-private-key-file", "This flag is currently no-op and will be deleted.")
 	fs.Int32Var(&o.Generic.ComponentConfig.ConcurrentServiceSyncs, "concurrent-service-syncs", o.Generic.ComponentConfig.ConcurrentServiceSyncs, "The number of services that are allowed to sync concurrently. Larger number = more responsive service management, but more CPU (and network) load")

 	leaderelectionconfig.BindFlags(&o.Generic.ComponentConfig.LeaderElection, fs)