From e485f8578da61feb8c22ee48df0cfcb870d2ad0d Mon Sep 17 00:00:00 2001 From: Sergei Orlov Date: Fri, 23 Mar 2018 14:16:04 +0300 Subject: [PATCH] kubeapiserver: rename '--experimental-encryption-provider-config' to '--encryption-provider-config'. This change renames the '--experimental-encryption-provider-config' flag to '--encryption-provider-config'. The old flag is accepted but generates a warning. In 1.14, we will drop support for '--experimental-encryption-provider-config' entirely. Co-authored-by: Stanislav Laznicka Kubernetes-commit: 21c1bb883081b13244002271bccc9cf119d4db4f --- pkg/server/options/etcd.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/server/options/etcd.go b/pkg/server/options/etcd.go index 7c2a08ba0..7db2cad8b 100644 --- a/pkg/server/options/etcd.go +++ b/pkg/server/options/etcd.go @@ -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.")