github/kubescape
1
0
Fork 0
mirror of https://github.com/kubescape/kubescape.git synced 2026-04-15 06:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

load data from config.json

Browse Source
This commit is contained in:
David Wertenteil
2022-05-22 15:21:06 +03:00
parent ac5e7069da
commit ac03a2bda3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/cautils/customerloader.go
+4
View File
@@ -288,9 +288,13 @@ func (c *ClusterConfig) loadConfigFromConfigMap() (*ConfigObj, error) {
return nil, err
}
if jsonConf, ok := configMap.Data["config.json"]; ok {
return readConfig([]byte(jsonConf))
}
if bData, err := json.Marshal(configMap.Data); err == nil {
return readConfig(bData)
}
return nil, nil
}
core/pkg/resourcehandler/k8sresources.go
+1 -1
View File
@@ -88,7 +88,7 @@ func (k8sHandler *K8sResourceHandler) GetResources(sessionObj *cautils.OPASessio
logger.L().Warning("failed to collect image vulnerabilities", helpers.Error(err))
}
if isEmptyImgVulns(*armoResourceMap) {
cautils.SetInfoMapForResources("image scanning not configured. For more information: https://hub.armo.cloud/docs/cluster-vulnerability-scanning", imgVulnResources, sessionObj.InfoMap)
cautils.SetInfoMapForResources("image scanning is not configured. for more information: https://hub.armo.cloud/docs/cluster-vulnerability-scanning", imgVulnResources, sessionObj.InfoMap)
}
}