Skip to content

Commit

Permalink
Merge pull request kubernetes#53795 from xiangpengzhao/deprecate-eqr
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 53119, 53753, 53795, 52981). 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>.

Mark etcd-quorum-read as deprecated.

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
ref: kubernetes#53662 #kubernetes#53717

**Special notes for your reviewer**:
/cc @liggitt @dims @anguslees 

**Release note**:

```release-note
Deprecation: The flag `etcd-quorum-read ` of kube-apiserver is deprecated and the ability to switch off quorum read will be removed in a future release.
```
  • Loading branch information
Kubernetes Submit Queue authored Oct 12, 2017
2 parents 03adf92 + 2a454dc commit 1289fac
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ func (s *EtcdOptions) AddFlags(fs *pflag.FlagSet) {
"SSL Certificate Authority file used to secure etcd communication.")

fs.BoolVar(&s.StorageConfig.Quorum, "etcd-quorum-read", s.StorageConfig.Quorum,
"If true, enable quorum read.")
"If true, enable quorum read. It defaults to true and is strongly recommended not setting to false.")
fs.MarkDeprecated("etcd-quorum-read", "This flag is deprecated and the ability to switch off quorum read will be removed in a future release.")

fs.StringVar(&s.EncryptionProviderConfigFilepath, "experimental-encryption-provider-config", s.EncryptionProviderConfigFilepath,
"The file containing configuration for encryption providers to be used for storing secrets in etcd")
Expand Down

0 comments on commit 1289fac

Please sign in to comment.