rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-12 21:24:00 +00:00
Code Issues Releases Wiki Activity

Revert "Add support for k8s 1.18"

Browse Source 
This reverts commit 763a896380.
This commit is contained in:
Arvind Iyengar
2020-05-27 12:48:10 -07:00
parent 4295b887b3
commit 6e194ab1a6
3 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/cluster.go
View File

@@ -718,11 +718,6 @@ func InitClusterObject(ctx context.Context, rkeConfig *v3.RancherKubernetesEngin
if len(c.CertificateDir) == 0 { if len(c.CertificateDir) == 0 {
c.CertificateDir = GetCertificateDirPath(c.ConfigPath, c.ConfigDir) c.CertificateDir = GetCertificateDirPath(c.ConfigPath, c.ConfigDir)
} }
// Setting cluster Defaults
err = c.setClusterDefaults(ctx, flags)
if err != nil {
return nil, err
}
// We don't manage custom configuration, if it's there we just use it. // We don't manage custom configuration, if it's there we just use it.
if isEncryptionCustomConfig(rkeConfig) { if isEncryptionCustomConfig(rkeConfig) {
if c.EncryptionConfig.EncryptionProviderFile, err = c.readEncryptionCustomConfig(); err != nil { if c.EncryptionConfig.EncryptionProviderFile, err = c.readEncryptionCustomConfig(); err != nil {
@@ -734,6 +729,11 @@ func InitClusterObject(ctx context.Context, rkeConfig *v3.RancherKubernetesEngin
} }
} }
// Setting cluster Defaults
err = c.setClusterDefaults(ctx, flags)
if err != nil {
return nil, err
}
// extract cluster network configuration // extract cluster network configuration
if err = c.setNetworkOptions(); err != nil { if err = c.setNetworkOptions(); err != nil {
return nil, fmt.Errorf("failed set network options: %v", err) return nil, fmt.Errorf("failed set network options: %v", err)

30
cluster/defaults.go
View File

@@ -323,17 +323,6 @@ func (c *Cluster) setClusterServicesDefaults() {
} }
} }
enableEncryptionByDefault, err := checkVersionNeedsEncryptionDefault(c.Version)
if err != nil {
logrus.Warnf("Cannot determine if cluster version [%s] needs to have encryption enabled by default: %v", c.Version, err)
}
if enableEncryptionByDefault && c.Services.KubeAPI.SecretsEncryptionConfig == nil {
logrus.Debugf("Enabling encryption of secret data at rest by default for cluster version [%s]", c.Version)
c.Services.KubeAPI.SecretsEncryptionConfig = &v3.SecretsEncryptionConfig{
Enabled: true,
}
}
if c.Services.KubeAPI.AuditLog != nil && if c.Services.KubeAPI.AuditLog != nil &&
c.Services.KubeAPI.AuditLog.Enabled { c.Services.KubeAPI.AuditLog.Enabled {
if c.Services.KubeAPI.AuditLog.Configuration == nil { if c.Services.KubeAPI.AuditLog.Configuration == nil {
@@ -724,22 +713,3 @@ func checkVersionNeedsKubeAPIAuditLog(k8sVersion string) (bool, error) {
logrus.Debugf("Cluster version [%s] does not need to have kube-api audit log enabled", k8sVersion[1:]) logrus.Debugf("Cluster version [%s] does not need to have kube-api audit log enabled", k8sVersion[1:])
return false, nil return false, nil
} }
func checkVersionNeedsEncryptionDefault(k8sVersion string) (bool, error) {
toMatch, err := semver.Make(k8sVersion[1:])
if err != nil {
return false, fmt.Errorf("Cluster version [%s] can not be parsed as semver", k8sVersion[1:])
}
logrus.Debugf("Checking if cluster version [%s] needs to have encryption enabled by default", k8sVersion[1:])
// encryption turned on by default in k8s 1.18.0 and up
clusterDefaultEncryptionRange, err := semver.ParseRange(">=1.18.0-rancher0")
if err != nil {
return false, errors.New("Failed to parse semver range while checking if encryption is enabled by default")
}
if clusterDefaultEncryptionRange(toMatch) {
logrus.Debugf("Cluster version [%s] needs to have encryption enabled by default", k8sVersion[1:])
return true, nil
}
logrus.Debugf("Cluster version [%s] does not need to have encryption enabled by default", k8sVersion[1:])
return false, nil
}

2
metadata/metadata.go
View File

@@ -90,7 +90,7 @@ func readFile(file string) ([]byte, error) {
return ioutil.ReadFile(file) return ioutil.ReadFile(file)
} }
const RKEVersionDev = "v1.1.1-rc100" const RKEVersionDev = "v0.2.3"
func initAddonTemplates(data kdm.Data) { func initAddonTemplates(data kdm.Data) {
K8sVersionToTemplates = data.K8sVersionedTemplates K8sVersionToTemplates = data.K8sVersionedTemplates