Merge pull request #71206 from stlaz/enc_config_opt

Rename '--experimental-encryption-provider-config' to '--encryption-provider-config'

Kubernetes-commit: 2b0212de9cdf4c2cc8d5619dcc26c1c0b8917203
This commit is contained in:
Kubernetes Publisher 2018-11-21 11:30:12 -08:00
commit e3c8fa95bb
1 changed files with 4 additions and 0 deletions

View File

@ -164,6 +164,10 @@ func (s *EtcdOptions) AddFlags(fs *pflag.FlagSet) {
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")
fs.MarkDeprecated("experimental-encryption-provider-config", "use --encryption-provider-config.")
fs.StringVar(&s.EncryptionProviderConfigFilepath, "encryption-provider-config", s.EncryptionProviderConfigFilepath,
"The file containing configuration for encryption providers to be used for storing secrets in etcd")
fs.DurationVar(&s.StorageConfig.CompactionInterval, "etcd-compaction-interval", s.StorageConfig.CompactionInterval,
"The interval of compaction requests. If 0, the compaction request from apiserver is disabled.")