diff --git a/core/cautils/customerloader.go b/core/cautils/customerloader.go index 6b4f7dda..a76dffe5 100644 --- a/core/cautils/customerloader.go +++ b/core/cautils/customerloader.go @@ -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 } diff --git a/core/pkg/resourcehandler/k8sresources.go b/core/pkg/resourcehandler/k8sresources.go index b16b0bcf..55af92bc 100644 --- a/core/pkg/resourcehandler/k8sresources.go +++ b/core/pkg/resourcehandler/k8sresources.go @@ -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) } }