Fixed 2 bugs where kafka intents & kafka server metadata were not reported properly to Otterize cloud

Author: zohar7ch

src/mapper/pkg/intentsstore/holder.go

@@ -162,11 +162,14 @@ func (i *IntentsHolder) addIntentToStore(store IntentsStore, newTimestamp time.T
 	existingIntent.Intent.Client.Labels = intent.Client.Labels
 	existingIntent.Intent.Server.Labels = intent.Server.Labels
 
-	if existingIntent.Intent.Server.ResolutionData.TCPDestResolveFixData == nil || intent.Server.ResolutionData.TCPDestResolveFixData == nil {
+	if (existingIntent.Intent.Server.ResolutionData != nil && existingIntent.Intent.Server.ResolutionData.TCPDestResolveFixData == nil) ||
+		(intent.Server.ResolutionData != nil && intent.Server.ResolutionData.TCPDestResolveFixData == nil) {
 		// One of the intents was not discovered using the bugfix, so we want to keep it that way.
 		// This is important because we might drop some of the discovered intents using the bugfix in Otterize-cloud, based on
 		// the fact they were discovered using the bugfix.
-		existingIntent.Intent.Server.ResolutionData.TCPDestResolveFixData = nil
+		if existingIntent.Intent.Server.ResolutionData != nil {
+			existingIntent.Intent.Server.ResolutionData.TCPDestResolveFixData = nil
+		}
 	}
 
 	store[key] = existingIntent

src/mapper/pkg/metadatareporter/metadata_reporter.go

@@ -185,7 +185,7 @@ func (r *MetadataReporter) fetchServiceIPs(ctx context.Context, serviceIdentity
 		}
 
 		for _, ip := range service.Spec.ClusterIPs {
-			if ip != "" {
+			if ip != "" && ip != "None" {
 				serviceIps.Add(ip)
 			}
 		}