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

Enable kube-api audit log for new k8s versions

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2020-03-13 07:55:41 +01:00
parent 746e9a1c21
commit d65d72ae6d
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
cluster/defaults.go
View File

@@ -3,9 +3,11 @@ package cluster
import (
"context"
"encoding/json"
"errors"
"fmt"
"strings"
"github.com/blang/semver"
"github.com/rancher/rke/cloudprovider"
"github.com/rancher/rke/docker"
"github.com/rancher/rke/k8s"
@@ -309,6 +311,18 @@ func (c *Cluster) setClusterServicesDefaults() {
}
}
enableKubeAPIAuditLog, err := checkVersionNeedsKubeAPIAuditLog(c.Version)
if err != nil {
logrus.Warnf("Can not determine if cluster version [%s] needs to have kube-api audit log enabled: %v", c.Version, err)
}
if enableKubeAPIAuditLog {
logrus.Debugf("Enabling kube-api audit log for cluster version [%s]", c.Version)
if c.Services.KubeAPI.AuditLog == nil {
c.Services.KubeAPI.AuditLog = &v3.AuditLog{Enabled: true}
}
}
if c.Services.KubeAPI.AuditLog != nil &&
c.Services.KubeAPI.AuditLog.Enabled {
if c.Services.KubeAPI.AuditLog.Configuration == nil {
@@ -680,3 +694,22 @@ func setDNSDeploymentAddonDefaults(updateStrategy *appsv1.DeploymentStrategy, dn
return updateStrategy
}
func checkVersionNeedsKubeAPIAuditLog(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 kube-api audit log enabled", k8sVersion[1:])
// kube-api audit log needs to be enabled for k8s 1.15.11 and up, k8s 1.16.8 and up, k8s 1.17.4 and up
clusterKubeAPIAuditLogRange, err := semver.ParseRange(">=1.15.11-rancher0 <=1.15.99 || >=1.16.8-rancher0 <=1.16.99 || >=1.17.4-rancher0")
if err != nil {
return false, errors.New("Failed to parse semver range for checking to enable kube-api audit log")
}
if clusterKubeAPIAuditLogRange(toMatch) {
logrus.Debugf("Cluster version [%s] needs to have kube-api audit log enabled", k8sVersion[1:])
return true, nil
}
logrus.Debugf("Cluster version [%s] does not need to have kube-api audit log enabled", k8sVersion[1:])
return false, nil
}

1
cmd/up.go
View File

@@ -277,7 +277,6 @@ func clusterUpFromCli(ctx *cli.Context) error {
}
rkeConfig, err := cluster.ParseConfig(clusterFile)
// logrus.Infof("melsayed---------clusterUpFromCli--------- %+v", rkeConfig.Services.KubeAPI.SecretsEncryptionConfig)
if err != nil {
return fmt.Errorf("Failed to parse cluster file: %v", err)
}