Merge pull request #394 from gianlucam76/classifier-reports

Advance sveltos-agent image

Author: gianlucam76

controllers/classifier_report_collection.go

@@ -137,6 +137,33 @@ func removeClusterClassifierReports(ctx context.Context, c client.Client, cluste
 	return nil
 }
 
+// ClassifierReports are collected from managed cluster to the management cluster.
+// When an ClassifierReport is collected from a managed cluster and created in the
+// management cluster, the label classifier.projectsveltos.io/cluster-name
+// is added. All ClassifierReport found in the management cluster with this
+// labels should be ignored as collected from other managed clusters.
+func shouldIgnore(cr *libsveltosv1beta1.ClassifierReport, isPullMode bool) bool {
+	if isPullMode {
+		// Sveltos-applier copies the EventReports to the management cluster
+		// and add this label to the EventReport
+		return false
+	}
+
+	if getAgentInMgmtCluster() {
+		// If sveltos-agent is in the management cluster, EventReports
+		// are directly generated by sveltos-agent here. So there is no
+		// copy to ignore.
+		return false
+	}
+
+	if cr.Labels == nil {
+		return false
+	}
+
+	_, ok := cr.Labels[libsveltosv1beta1.ClassifierReportClusterNameLabel]
+	return ok
+}
+
 // Periodically collects ClassifierReports from each cluster.
 // If sharding is used, it will collect only from clusters matching shard.
 func collectClassifierReports(c client.Client, shardKey, capiOnboardAnnotation, version string, logger logr.Logger) {
@@ -237,10 +264,7 @@ func collectClassifierReportsFromCluster(ctx context.Context, c client.Client,
 			// ignore deleted ClassifierReport
 			continue
 		}
-		if cr.Spec.ClusterName != "" {
-			// if ClusterName is set, this is coming from a
-			// managed cluster. If management cluster is in turn
-			// managed by another cluster, do not pull those.
+		if shouldIgnore(cr, isPullMode) {
 			continue
 		}
 		l := logger.WithValues("classifierReport", cr.Name)

pkg/agent/sveltos-agent-in-mgmt-cluster.go

@@ -47,7 +47,7 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:fbd928be1cc5042bd509665defdd16da9d3e6f85b44130b96db754bf7e719779
+        image: docker.io/projectsveltos/sveltos-agent@sha256:e1338fb576f4af2d1b15567e4f08276fd359b67d6b149e38c88ed457c1894894
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/agent/sveltos-agent-in-mgmt-cluster.yaml

@@ -29,7 +29,7 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:fbd928be1cc5042bd509665defdd16da9d3e6f85b44130b96db754bf7e719779
+        image: docker.io/projectsveltos/sveltos-agent@sha256:e1338fb576f4af2d1b15567e4f08276fd359b67d6b149e38c88ed457c1894894
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/agent/sveltos-agent.go

@@ -198,7 +198,7 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:fbd928be1cc5042bd509665defdd16da9d3e6f85b44130b96db754bf7e719779
+        image: docker.io/projectsveltos/sveltos-agent@sha256:e1338fb576f4af2d1b15567e4f08276fd359b67d6b149e38c88ed457c1894894
         livenessProbe:
           failureThreshold: 3
           httpGet:

pkg/agent/sveltos-agent.yaml

@@ -180,7 +180,7 @@ spec:
         - --run-mode=do-not-send-reports
         command:
         - /manager
-        image: docker.io/projectsveltos/sveltos-agent@sha256:fbd928be1cc5042bd509665defdd16da9d3e6f85b44130b96db754bf7e719779
+        image: docker.io/projectsveltos/sveltos-agent@sha256:e1338fb576f4af2d1b15567e4f08276fd359b67d6b149e38c88ed457c1894894
         livenessProbe:
           failureThreshold: 3
           httpGet: