rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-31 14:36:32 +00:00
Code Issues Releases Wiki Activity

change enc provider arg, update defaults for audit log config

Browse Source
This commit is contained in:
Murali Paluru
2019-11-21 13:56:48 -08:00
committed by Alena Prokharchyk
parent 843e14135f
commit b9900f3b9c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/plan.go
View File

@@ -50,6 +50,8 @@ const (
// MaxEtcdOldEnvVersion The versions are maxed out for minor versions because -rancher1 suffix will cause semver to think its older, example: v1.15.0 > v1.15.0-rancher1
MaxEtcdOldEnvVersion = "v3.2.99"
MaxK8s115Version = "v1.15"
EncryptionProviderConfigArgument = "encryption-provider-config"
)
var admissionControlOptionNames = []string{"enable-admission-plugins", "admission-control"}
@@ -219,7 +221,7 @@ func (c *Cluster) BuildKubeAPIProcess(host *hosts.Host, prefixPath string, svcOp
fmt.Sprintf("%s=%s", CloudConfigSumEnv, getCloudConfigChecksum(c.CloudConfigFile)))
}
if c.EncryptionConfig.EncryptionProviderFile != "" {
CommandArgs["experimental-encryption-provider-config"] = EncryptionProviderFilePath
CommandArgs[EncryptionProviderConfigArgument] = EncryptionProviderFilePath
}
if c.IsKubeletGenerateServingCertificateEnabled() {