fix: add event filter to prevent cg status from being reconciled inde…

…finitely (#1616) 1. add event filter for reconciler of collector group - to prevent endless reconcile loops 2. remove unused property from collector group CRD 3. pin version of java base image in tests for deterministic test result
odigos-io · Oct 24, 2024 · 5ded5ee · 5ded5ee
1 parent b302071
commit 5ded5ee
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 18 deletions.
diff --git a/api/config/crd/bases/odigos.io_collectorsgroups.yaml b/api/config/crd/bases/odigos.io_collectorsgroups.yaml
@@ -42,8 +42,6 @@ spec:
           spec:
             description: CollectorsGroupSpec defines the desired state of Collector
             properties:
-              inputSvc:
-                type: string
               role:
                 enum:
                 - CLUSTER_GATEWAY

diff --git a/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroupspec.go b/api/generated/odigos/applyconfiguration/odigos/v1alpha1/collectorsgroupspec.go
diff --git a/api/odigos/v1alpha1/collectorsgroup_types.go b/api/odigos/v1alpha1/collectorsgroup_types.go
@@ -32,8 +32,7 @@ const (
 
 // CollectorsGroupSpec defines the desired state of Collector
 type CollectorsGroupSpec struct {
-	InputSvc string              `json:"inputSvc,omitempty"`
-	Role     CollectorsGroupRole `json:"role"`
+	Role CollectorsGroupRole `json:"role"`
 }
 
 // CollectorsGroupStatus defines the observed state of Collector

diff --git a/autoscaler/controllers/collectorsgroup_controller.go b/autoscaler/controllers/collectorsgroup_controller.go
@@ -22,6 +22,8 @@ import (
 	odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	"github.com/odigos-io/odigos/autoscaler/controllers/datacollection"
 	"github.com/odigos-io/odigos/autoscaler/controllers/gateway"
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -30,6 +32,28 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+type onlyCreatePredicate struct {
+	predicate.Funcs
+}
+
+func (i *onlyCreatePredicate) Create(e event.CreateEvent) bool {
+	return true
+}
+
+func (i *onlyCreatePredicate) Update(e event.UpdateEvent) bool {
+	return false
+}
+
+func (i *onlyCreatePredicate) Delete(e event.DeleteEvent) bool {
+	return false
+}
+
+func (i *onlyCreatePredicate) Generic(e event.GenericEvent) bool {
+	return false
+}
+
+var _ predicate.Predicate = &onlyCreatePredicate{}
+
 // CollectorsGroupReconciler reconciles a CollectorsGroup object
 type CollectorsGroupReconciler struct {
 	client.Client
@@ -78,5 +102,6 @@ func (r *CollectorsGroupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 func (r *CollectorsGroupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&odigosv1.CollectorsGroup{}).
+		WithEventFilter(&onlyCreatePredicate{}).
 		Complete(r)
 }
diff --git a/tests/e2e/workload-lifecycle/services/java-http-server/java-azul.Dockerfile b/tests/e2e/workload-lifecycle/services/java-http-server/java-azul.Dockerfile
@@ -3,7 +3,7 @@ COPY src /home/app/src
 COPY pom.xml /home/app
 RUN mvn -f /home/app/pom.xml clean package
 
-FROM azul/zulu-openjdk-alpine:17-jre
+FROM azul/zulu-openjdk-alpine:17.0.12-jre-headless
 COPY --from=build /home/app/target/*.jar /app/java-azul.jar
 USER 15000
 CMD ["java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseZGC", "-jar", "/app/java-azul.jar"]
diff --git a/tests/e2e/workload-lifecycle/services/java-http-server/java-supported-docker-env.Dockerfile b/tests/e2e/workload-lifecycle/services/java-http-server/java-supported-docker-env.Dockerfile
@@ -3,7 +3,7 @@ COPY src /home/app/src
 COPY pom.xml /home/app
 RUN mvn -f /home/app/pom.xml clean package
 
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:17.0.12_7-jre-jammy
 ENV JAVA_OPTS="-Dthis.does.not.exist=true"
 COPY --from=build /home/app/target/*.jar /app/java-supported-docker-env.jar
 USER 15000

diff --git a/...s/e2e/workload-lifecycle/services/java-http-server/java-supported-manifest-env.Dockerfile b/...s/e2e/workload-lifecycle/services/java-http-server/java-supported-manifest-env.Dockerfile
@@ -3,7 +3,7 @@ COPY src /home/app/src
 COPY pom.xml /home/app
 RUN mvn -f /home/app/pom.xml clean package
 
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:17.0.12_7-jre-jammy
 COPY --from=build /home/app/target/*.jar /app/java-supported-manifest-env.jar
 USER 15000
 CMD ["java","-jar", "/app/java-supported-manifest-env.jar"]
diff --git a/tests/e2e/workload-lifecycle/services/java-http-server/java-supported-version.Dockerfile b/tests/e2e/workload-lifecycle/services/java-http-server/java-supported-version.Dockerfile
@@ -3,7 +3,7 @@ COPY src /home/app/src
 COPY pom.xml /home/app
 RUN mvn -f /home/app/pom.xml clean package
 
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:17.0.12_7-jre-jammy
 COPY --from=build /home/app/target/*.jar /app/java-supported-version.jar
 USER 15000
 CMD ["java","-jar", "/app/java-supported-version.jar"]