Merge branch 'main' into add-hooks

Author: kirkbrauer

.github/workflows/test.yaml

@@ -15,5 +15,16 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Run make deploy
+      - name: Run controller tests
         run: make test
+
+      - name: Cache operator bin directory
+        uses: actions/cache@v4
+        with:
+          path: deploy/operator/bin/
+          key: ${{ runner.os }}-operator-bin-${{ hashFiles('deploy/operator/go.mod') }}
+          restore-keys: |
+            ${{ runner.os }}-operator-bin-
+
+      - name: Run operator tests
+        run: make -C deploy/operator test

README.md

@@ -1,4 +1,10 @@
-# jumpstarter-router
+# jumpstarter-controller
+
+[![Build and push container image](https://github.com/jumpstarter-dev/jumpstarter-controller/actions/workflows/build.yaml/badge.svg)](https://github.com/jumpstarter-dev/jumpstarter-controller/actions/workflows/build.yaml)
+![GitHub Release](https://img.shields.io/github/v/release/jumpstarter-dev/jumpstarter-controller)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/jumpstarter-dev/jumpstarter-controller/total)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/jumpstarter-dev/jumpstarter-controller)
+
 // TODO(user): Add simple overview of use/purpose
 
 ## Description

api/v1alpha1/lease_helpers.go

@@ -14,6 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
 	kclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -73,12 +74,107 @@ func ReconcileLeaseTimeFields(beginTime, endTime **metav1.Time, duration **metav
 	return nil
 }
 
+// ParseLabelSelector parses a label selector string and converts it to metav1.LabelSelector.
+// This function supports the != operator by first parsing with labels.Parse() which supports
+// all label selector syntax including !=, then converting to metav1.LabelSelector format.
+func ParseLabelSelector(selectorStr string) (*metav1.LabelSelector, error) {
+	// First, try to parse using labels.Parse() which supports != operator
+	parsedSelector, err := labels.Parse(selectorStr)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse label selector: %w", err)
+	}
+
+	// Extract requirements from the parsed selector
+	requirements, selectable := parsedSelector.Requirements()
+	if !selectable {
+		return &metav1.LabelSelector{}, nil
+	}
+
+	// Convert requirements to metav1.LabelSelector format
+	matchLabels := make(map[string]string)
+	var matchExpressions []metav1.LabelSelectorRequirement
+
+	// Track NotEquals requirements by key so we can combine them into NotIn
+	notEqualsByKey := make(map[string][]string)
+
+	for _, req := range requirements {
+		key := req.Key()
+		operator := req.Operator()
+		values := req.ValuesUnsorted()
+
+		switch operator {
+		case selection.Equals:
+			// For exact match with single value, use matchLabels
+			if len(values) == 1 {
+				// Check if we already have an equality requirement for this key with a different value
+				if existingValue, exists := matchLabels[key]; exists && existingValue != values[0] {
+					return nil, fmt.Errorf("invalid selector: label %s cannot have multiple equality requirements with different values (%s and %s)", key, existingValue, values[0])
+				}
+				matchLabels[key] = values[0]
+			} else {
+				// Multiple values should use In operator
+				matchExpressions = append(matchExpressions, metav1.LabelSelectorRequirement{
+					Key:      key,
+					Operator: metav1.LabelSelectorOpIn,
+					Values:   values,
+				})
+			}
+		case selection.NotEquals:
+			// Accumulate != requirements for the same key to combine into NotIn
+			if len(values) != 1 {
+				return nil, fmt.Errorf("invalid selector: != operator requires exactly one value")
+			}
+			notEqualsByKey[key] = append(notEqualsByKey[key], values[0])
+		case selection.In:
+			matchExpressions = append(matchExpressions, metav1.LabelSelectorRequirement{
+				Key:      key,
+				Operator: metav1.LabelSelectorOpIn,
+				Values:   values,
+			})
+		case selection.NotIn:
+			matchExpressions = append(matchExpressions, metav1.LabelSelectorRequirement{
+				Key:      key,
+				Operator: metav1.LabelSelectorOpNotIn,
+				Values:   values,
+			})
+		case selection.Exists:
+			matchExpressions = append(matchExpressions, metav1.LabelSelectorRequirement{
+				Key:      key,
+				Operator: metav1.LabelSelectorOpExists,
+				Values:   []string{},
+			})
+		case selection.DoesNotExist:
+			matchExpressions = append(matchExpressions, metav1.LabelSelectorRequirement{
+				Key:      key,
+				Operator: metav1.LabelSelectorOpDoesNotExist,
+				Values:   []string{},
+			})
+		default:
+			return nil, fmt.Errorf("unsupported label selector operator: %v", operator)
+		}
+	}
+
+	// Convert accumulated NotEquals requirements to NotIn expressions
+	for key, vals := range notEqualsByKey {
+		matchExpressions = append(matchExpressions, metav1.LabelSelectorRequirement{
+			Key:      key,
+			Operator: metav1.LabelSelectorOpNotIn,
+			Values:   vals,
+		})
+	}
+
+	return &metav1.LabelSelector{
+		MatchLabels:      matchLabels,
+		MatchExpressions: matchExpressions,
+	}, nil
+}
+
 func LeaseFromProtobuf(
 	req *cpb.Lease,
 	key types.NamespacedName,
 	clientRef corev1.LocalObjectReference,
 ) (*Lease, error) {
-	selector, err := metav1.ParseToLabelSelector(req.Selector)
+	selector, err := ParseLabelSelector(req.Selector)
 	if err != nil {
 		return nil, err
 	}