Merge pull request #1209 from gianlucam76/resourcesummary-agentless

(Bug Fix) Conflict Handover

Author: gianlucam76

controllers/handlers_helm.go

@@ -1797,6 +1797,32 @@ func undeployStaleReleases(ctx context.Context, c client.Client, clusterSummary
 				return nil, err
 			}
 
+			if clusterSummary.Spec.ClusterProfileSpec.SyncMode != configv1beta1.SyncModeDryRun {
+				// If another ClusterSummary is queued to manage this chart in this cluster, do not uninstall.
+				// Let the other ClusterSummary take it over.
+
+				currentChart := &configv1beta1.HelmChart{
+					ReleaseNamespace: managedHelmReleases[i].Namespace,
+					ReleaseName:      managedHelmReleases[i].Name,
+				}
+				otherRegisteredClusterSummaries := chartManager.GetRegisteredClusterSummariesForChart(
+					clusterSummary.Spec.ClusterNamespace, clusterSummary.Spec.ClusterName,
+					clusterSummary.Spec.ClusterType, currentChart)
+				if len(otherRegisteredClusterSummaries) > 1 {
+					// Immediately unregister so next inline ClusterSummary can take this over
+					chartManager.UnregisterClusterSummaryForChart(clusterSummary, currentChart)
+					err = requeueAllOtherClusterSummaries(ctx, c, clusterSummary.Spec.ClusterNamespace,
+						otherRegisteredClusterSummaries, logger)
+					if err != nil {
+						// TODO: Handle errors to prevent bad state. ClusterSummary no longer manage the chart,
+						// but no other ClusterSummary instance has been requeued.
+						return nil, err
+					}
+
+					continue
+				}
+			}
+
 			if err := uninstallRelease(ctx, clusterSummary, managedHelmReleases[i].Name,
 				managedHelmReleases[i].Namespace, kubeconfig, &registryClientOptions{}, nil,
 				logger); err != nil {

pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.go

@@ -47,7 +47,7 @@ spec:
         - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/drift-detection-manager@sha256:17c2c10741ecf13fa7dceb495edb62dc905b8f9f76a645c6bacea087137f5fa3
+        image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/drift-detection/drift-detection-manager-in-mgmt-cluster.yaml

@@ -29,7 +29,7 @@ spec:
         - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/drift-detection-manager@sha256:17c2c10741ecf13fa7dceb495edb62dc905b8f9f76a645c6bacea087137f5fa3
+        image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/drift-detection/drift-detection-manager.go

@@ -141,7 +141,7 @@ spec:
         - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/drift-detection-manager@sha256:17c2c10741ecf13fa7dceb495edb62dc905b8f9f76a645c6bacea087137f5fa3
+        image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/drift-detection/drift-detection-manager.yaml

@@ -123,7 +123,7 @@ spec:
         - --version=main
         command:
         - /manager
-        image: docker.io/projectsveltos/drift-detection-manager@sha256:17c2c10741ecf13fa7dceb495edb62dc905b8f9f76a645c6bacea087137f5fa3
+        image: docker.io/projectsveltos/drift-detection-manager@sha256:34aebc52b3aeb98d31a14393ca11ae07eee0b2836e15d53c4a559186ee45957f
         livenessProbe:
           failureThreshold: 3
           httpGet: