feat(devbox): support extra resource and annotation matcher

Author: lingdie

controllers/devbox/cmd/main.go

@@ -87,7 +87,7 @@ func main() {
 	// pod matcher flag
 	var enablePodResourceMatcher bool
 	var enablePodExtraResourceMatcher bool
-	var enablePodExpectedAnnotationsMatcher bool
+	var enablePodAnnotationsMatcher bool
 	var enablePodEnvMatcher bool
 	var enablePodPortMatcher bool
 	var enablePodEphemeralStorageMatcher bool
@@ -122,7 +122,7 @@ func main() {
 	// pod matcher flag, pod resource matcher, env matcher, port matcher will be enabled by default, ephemeral storage matcher will be disabled by default
 	flag.BoolVar(&enablePodResourceMatcher, "enable-pod-resource-matcher", true, "If set, pod resource matcher will be enabled")
 	flag.BoolVar(&enablePodExtraResourceMatcher, "enable-pod-extra-resource-matcher", true, "If set, pod extra resource matcher will be enabled")
-	flag.BoolVar(&enablePodExpectedAnnotationsMatcher, "enable-pod-expected-annotations-matcher", true, "If set, pod expected annotations matcher will be enabled")
+	flag.BoolVar(&enablePodAnnotationsMatcher, "enable-pod-expected-annotations-matcher", true, "If set, pod expected annotations matcher will be enabled")
 	flag.BoolVar(&enablePodEnvMatcher, "enable-pod-env-matcher", true, "If set, pod env matcher will be enabled")
 	flag.BoolVar(&enablePodPortMatcher, "enable-pod-port-matcher", true, "If set, pod port matcher will be enabled")
 	flag.BoolVar(&enablePodEphemeralStorageMatcher, "enable-pod-ephemeral-storage-matcher", false, "If set, pod ephemeral storage matcher will be enabled")
@@ -235,8 +235,8 @@ func main() {
 	if enablePodExtraResourceMatcher {
 		podMatchers = append(podMatchers, matcher.ExtraResourceMatcher{})
 	}
-	if enablePodExpectedAnnotationsMatcher {
-		podMatchers = append(podMatchers, matcher.ExpectedAnnotationsMatcher{})
+	if enablePodAnnotationsMatcher {
+		podMatchers = append(podMatchers, matcher.AnnotationsMatcher{})
 	}
 	if enablePodEnvMatcher {
 		podMatchers = append(podMatchers, matcher.EnvVarMatcher{})

controllers/devbox/internal/controller/devbox_controller.go

@@ -404,7 +404,7 @@ func (r *DevboxReconciler) syncPod(ctx context.Context, devbox *devboxv1alpha1.D
 			}
 			// update devbox status with latestDevbox status
 			logger.Info("updating devbox status")
-			logger.Info("merge commit history", "devbox", devbox.Status.CommitHistory, "latestDevbox", latestDevbox.Status.CommitHistory)
+			// logger.Info("merge commit history", "devbox", devbox.Status.CommitHistory, "latestDevbox", latestDevbox.Status.CommitHistory)
 			devbox.Status.Phase = helper.GenerateDevboxPhase(devbox, podList)
 			helper.UpdateDevboxStatus(devbox, latestDevbox)
 			return r.Status().Update(ctx, latestDevbox)

controllers/devbox/internal/controller/utils/matcher/matcher.go

@@ -16,10 +16,15 @@ package matcher
 
 import (
 	"log/slog"
+	"os"
 
 	corev1 "k8s.io/api/core/v1"
 )
 
+func init() {
+	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelInfo})))
+}
+
 type PodMatcher interface {
 	Match(expectPod *corev1.Pod, pod *corev1.Pod) bool
 }
@@ -94,7 +99,7 @@ func compareExtraResourceList(expect corev1.ResourceList, actual corev1.Resource
 	return true
 }
 
-func compareExpectedAnnotations(expect map[string]string, actual map[string]string) bool {
+func compareAnnotations(expect map[string]string, actual map[string]string) bool {
 	if len(expect) == 0 {
 		return true
 	}
@@ -128,10 +133,10 @@ func (m ExtraResourceMatcher) Match(expectPod *corev1.Pod, pod *corev1.Pod) bool
 	return checkPodResources(expectPod, pod, extraResourceChecker)
 }
 
-type ExpectedAnnotationsMatcher struct{}
+type AnnotationsMatcher struct{}
 
-func (m ExpectedAnnotationsMatcher) Match(expectPod *corev1.Pod, pod *corev1.Pod) bool {
-	return compareExpectedAnnotations(expectPod.Annotations, pod.Annotations)
+func (m AnnotationsMatcher) Match(expectPod *corev1.Pod, pod *corev1.Pod) bool {
+	return compareAnnotations(expectPod.Annotations, pod.Annotations)
 }
 
 type EphemeralStorageMatcher struct{}

controllers/devbox/internal/controller/utils/matcher/matcher_test.go

@@ -348,12 +348,12 @@ func TestExpectedAnnotationsMatcher(t *testing.T) {
 		},
 	}
 
-	annotationMatcher := ExpectedAnnotationsMatcher{}
+	annotationMatcher := AnnotationsMatcher{}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			result := annotationMatcher.Match(expectPod, tt.pod)
 			if result != tt.expected {
-				t.Errorf("ExpectedAnnotationsMatcher.Match() = %v, expected %v", result, tt.expected)
+				t.Errorf("AnnotationsMatcher.Match() = %v, expected %v", result, tt.expected)
 			}
 		})
 	}