merge

core/cautils/scaninfo.go

@@ -198,10 +198,7 @@ func (scanInfo *ScanInfo) contains(policyName string) bool {
 func scanInfoToScanMetadata(scanInfo *ScanInfo) *reporthandlingv2.Metadata {
 	metadata := &reporthandlingv2.Metadata{}
 
-<<<<<<< HEAD
 	metadata.ClusterMetadata.ContextName = k8sinterface.GetContextName()
-=======
->>>>>>> upstream/dev
 	metadata.ScanMetadata.Format = scanInfo.Format
 	metadata.ScanMetadata.FormatVersion = scanInfo.FormatVersion
 	metadata.ScanMetadata.Submit = scanInfo.Submit
@@ -247,7 +244,7 @@ func setContextMetadata(contextMetadata *reporthandlingv2.ContextMetadata, input
 	// if cluster
 	if input == "" {
 		contextMetadata.ClusterContextMetadata = &reporthandlingv2.ClusterMetadata{
-			ContextName: k8sinterface.GetClusterName(),
+			ContextName: k8sinterface.GetContextName(),
 		}
 		return
 	}

go.mod

@@ -3,15 +3,9 @@ module github.com/armosec/kubescape/v2
 go 1.17
 
 require (
-<<<<<<< HEAD:core/go.mod
 	github.com/armosec/armoapi-go v0.0.66
 	github.com/armosec/k8s-interface v0.0.69
 	github.com/armosec/opa-utils v0.0.130
-=======
-	github.com/armosec/armoapi-go v0.0.66
-	github.com/armosec/k8s-interface v0.0.68
-	github.com/armosec/opa-utils v0.0.130
->>>>>>> upstream/dev:go.mod
 	github.com/armosec/rbac-utils v0.0.14
 	github.com/armosec/utils-go v0.0.3
 	github.com/armosec/utils-k8s-go v0.0.5