rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-04-28 11:36:27 +00:00
Code Issues Releases Wiki Activity

review comments, build failure fixes

Browse Source
This commit is contained in:
Murali Paluru 2019-10-31 13:35:48 -07:00 committed by Alena Prokharchyk
parent bf8688e709
commit e811e18fb3
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cluster/cluster.go
View File

@ -163,16 +163,30 @@ func parseAuditLogConfig(clusterFile string, rkeConfig *v3.RancherKubernetesEngi
return nil return nil
} }
logrus.Debugf("audit log policy found in cluster.yml") logrus.Debugf("audit log policy found in cluster.yml")
var err error
var r map[string]interface{} var r map[string]interface{}
err = ghodssyaml.Unmarshal([]byte(clusterFile), &r) err := ghodssyaml.Unmarshal([]byte(clusterFile), &r)
if err != nil { if err != nil {
return fmt.Errorf("error unmarshalling: %v", err) return fmt.Errorf("error unmarshalling: %v", err)
} }
if r["services"] == nil {
return nil
}
services := r["services"].(map[string]interface{}) services := r["services"].(map[string]interface{})
if services["kube-api"] == nil {
return nil
}
kubeapi := services["kube-api"].(map[string]interface{}) kubeapi := services["kube-api"].(map[string]interface{})
if kubeapi["audit_log"] == nil {
return nil
}
auditlog := kubeapi["audit_log"].(map[string]interface{}) auditlog := kubeapi["audit_log"].(map[string]interface{})
if auditlog["configuration"] == nil {
return nil
}
alc := auditlog["configuration"].(map[string]interface{}) alc := auditlog["configuration"].(map[string]interface{})
if alc["policy"] == nil {
return nil
}
policyBytes, err := json.Marshal(alc["policy"]) policyBytes, err := json.Marshal(alc["policy"])
if err != nil { if err != nil {
return fmt.Errorf("error marshalling audit policy: %v", err) return fmt.Errorf("error marshalling audit policy: %v", err)
@ -197,14 +211,22 @@ func parseAdmissionConfig(clusterFile string, rkeConfig *v3.RancherKubernetesEng
return nil return nil
} }
logrus.Debugf("admission configuration found in cluster.yml") logrus.Debugf("admission configuration found in cluster.yml")
var err error
var r map[string]interface{} var r map[string]interface{}
err = ghodssyaml.Unmarshal([]byte(clusterFile), &r) err := ghodssyaml.Unmarshal([]byte(clusterFile), &r)
if err != nil { if err != nil {
return fmt.Errorf("error unmarshalling: %v", err) return fmt.Errorf("error unmarshalling: %v", err)
} }
if r["services"] == nil {
return nil
}
services := r["services"].(map[string]interface{}) services := r["services"].(map[string]interface{})
if services["kube-api"] == nil {
return nil
}
kubeapi := services["kube-api"].(map[string]interface{}) kubeapi := services["kube-api"].(map[string]interface{})
if kubeapi["admission_configuration"] == nil {
return nil
}
data, err := json.Marshal(kubeapi["admission_configuration"]) data, err := json.Marshal(kubeapi["admission_configuration"])
if err != nil { if err != nil {
return fmt.Errorf("error marshalling admission configuration: %v", err) return fmt.Errorf("error marshalling admission configuration: %v", err)