Fixing cache so it will replace workload profiles in case of quick restart (#575)

Signed-off-by: Amit Schendel <[email protected]>

Author: amitschendel

pkg/objectcache/applicationprofilecache/applicationprofilecache.go

@@ -151,7 +151,7 @@ func (apc *ApplicationProfileCacheImpl) updateAllProfiles(ctx context.Context) {
 			}
 
 			// Get the workload ID from profile
-			workloadID := profile.Annotations[helpersv1.WlidMetadataKey]
+			workloadID := apc.wlidKey(profile.Annotations[helpersv1.WlidMetadataKey], profile.Labels[helpersv1.TemplateHashKey])
 			if workloadID == "" {
 				continue
 			}
@@ -429,7 +429,7 @@ func (apc *ApplicationProfileCacheImpl) addContainer(container *containercollect
 			return err
 		}
 
-		workloadID := sharedData.Wlid
+		workloadID := apc.wlidKey(sharedData.Wlid, sharedData.InstanceID.GetTemplateHash())
 		if workloadID == "" {
 			logger.L().Debug("empty workloadID for container", helpers.String("containerID", containerID))
 			return nil
@@ -516,6 +516,10 @@ func (apc *ApplicationProfileCacheImpl) profileKey(namespace, name string) strin
 	return fmt.Sprintf("%s/%s", namespace, name)
 }
 
+func (apc *ApplicationProfileCacheImpl) wlidKey(wlid, templateHash string) string {
+	return fmt.Sprintf("%s/%s", wlid, templateHash)
+}
+
 func (apc *ApplicationProfileCacheImpl) performMerge(normalProfile, userManagedProfile *v1beta1.ApplicationProfile) *v1beta1.ApplicationProfile {
 	mergedProfile := normalProfile.DeepCopy()
 

pkg/objectcache/networkneighborhoodcache/networkneighborhoodcache.go

@@ -143,7 +143,10 @@ func (nnc *NetworkNeighborhoodCacheImpl) updateAllNetworkNeighborhoods(ctx conte
 			}
 
 			// Get the workload ID from network neighborhood
-			workloadID := nn.Annotations[helpersv1.WlidMetadataKey]
+			workloadID := nnc.wlidKey(
+				nn.Annotations[helpersv1.WlidMetadataKey],
+				nn.Labels[helpersv1.TemplateHashKey],
+			)
 			if workloadID == "" {
 				continue
 			}
@@ -349,7 +352,7 @@ func (nnc *NetworkNeighborhoodCacheImpl) addContainer(container *containercollec
 			return err
 		}
 
-		workloadID := sharedData.Wlid
+		workloadID := nnc.wlidKey(sharedData.Wlid, sharedData.InstanceID.GetTemplateHash())
 		if workloadID == "" {
 			logger.L().Debug("empty workloadID for container", helpers.String("containerID", containerID))
 			return nil
@@ -434,6 +437,10 @@ func (nnc *NetworkNeighborhoodCacheImpl) networkNeighborhoodKey(namespace, name
 	return fmt.Sprintf("%s/%s", namespace, name)
 }
 
+func (nnc *NetworkNeighborhoodCacheImpl) wlidKey(wlid, templateHash string) string {
+	return fmt.Sprintf("%s/%s", wlid, templateHash)
+}
+
 // GetNetworkNeighborhood gets the network neighborhood for a container
 func (nnc *NetworkNeighborhoodCacheImpl) GetNetworkNeighborhood(containerID string) *v1beta1.NetworkNeighborhood {
 	// Get container info