Add operator CI

Signed-off-by: Zike Yang <[email protected]>

Author: RobertIndie

.github/workflows/ci.yaml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.22' ]
+        go-version: [ '1.24' ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
@@ -73,3 +73,17 @@ jobs:
         run: |
           make test
 
+  test-operator:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [ '1.24' ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Test Operator
+        working-directory: operator
+        run: |
+          make test

operator/cmd/main.go

@@ -242,7 +242,7 @@ func main() {
 	// nolint:goconst
 	if os.Getenv("ENABLE_WEBHOOKS") != "false" {
 		if err = webhookfsv1alpha1.SetupPackagesWebhookWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create webhook", "webhook", "Packages")
+			setupLog.Error(err, "unable to create webhook", "webhook", "Package")
 			os.Exit(1)
 		}
 	}

operator/config/crd/kustomization.yaml

@@ -2,7 +2,6 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- ./bases/fs.functionstream.github.io_packages.yaml
 - bases/fs.functionstream.github.io_functions.yaml
 - bases/fs.functionstream.github.io_packages.yaml
 # +kubebuilder:scaffold:crdkustomizeresource

operator/config/webhook/manifests.yaml

@@ -67,6 +67,7 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - DELETE
     resources:
     - functions
   sideEffects: None
@@ -87,6 +88,7 @@ webhooks:
     operations:
     - CREATE
     - UPDATE
+    - DELETE
     resources:
-    - package
+    - packages
   sideEffects: None

operator/internal/controller/function_controller.go

@@ -169,7 +169,7 @@ func (r *FunctionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 					Containers: []corev1.Container{{
 						Name:            "function",
 						Image:           image,
-						ImagePullPolicy: corev1.PullNever,
+						ImagePullPolicy: corev1.PullIfNotPresent,
 						VolumeMounts: []corev1.VolumeMount{{
 							Name:      "function-config",
 							MountPath: "/function/config.yaml",
@@ -203,13 +203,13 @@ func (r *FunctionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 			existingDeploy.Labels = deployment.Labels
 			err = r.Update(ctx, &existingDeploy)
 			if err != nil {
-				return ctrl.Result{}, err
+				return HandleReconcileError(log, err, "Conflict when updating Deployment, will retry automatically")
 			}
 		}
 	} else if errors.IsNotFound(deployErr) {
 		err = r.Create(ctx, deployment)
 		if err != nil {
-			return ctrl.Result{}, err
+			return HandleReconcileError(log, err, "Conflict when creating Deployment, will retry automatically")
 		}
 	} else {
 		return ctrl.Result{}, deployErr
@@ -219,8 +219,7 @@ func (r *FunctionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 	if err := r.Get(ctx, types.NamespacedName{Name: deployName, Namespace: fn.Namespace}, &existingDeploy); err == nil {
 		fn.Status = convertDeploymentStatusToFunctionStatus(&existingDeploy.Status)
 		if err := r.Status().Update(ctx, &fn); err != nil {
-			log.Error(err, "Failed to update Function status")
-			return ctrl.Result{}, err
+			return HandleReconcileError(log, err, "Conflict when updating Function status, will retry automatically")
 		}
 	}
 

operator/internal/controller/util.go

@@ -0,0 +1,16 @@
+package controller
+
+import (
+	"github.com/go-logr/logr"
+	"k8s.io/apimachinery/pkg/api/errors"
+	ctrl "sigs.k8s.io/controller-runtime"
+)
+
+// HandleReconcileError handles errors in reconcile loops, logging conflicts as info and returning nil error for them.
+func HandleReconcileError(log logr.Logger, err error, conflictMsg string) (ctrl.Result, error) {
+	if errors.IsConflict(err) {
+		log.V(1).Info(conflictMsg, "error", err)
+		return ctrl.Result{}, nil
+	}
+	return ctrl.Result{}, err
+}

operator/internal/webhook/v1alpha1/function_webhook.go

@@ -80,7 +80,7 @@ func (d *FunctionCustomDefaulter) Default(ctx context.Context, obj runtime.Objec
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
 // NOTE: The 'path' attribute must follow a specific pattern and should not be modified directly here.
 // Modifying the path for an invalid path can cause API server errors; failing to locate the webhook.
-// +kubebuilder:webhook:path=/validate-fs-functionstream-github-io-v1alpha1-function,mutating=false,failurePolicy=fail,sideEffects=None,groups=fs.functionstream.github.io,resources=functions,verbs=create;update,versions=v1alpha1,name=vfunction-v1alpha1.kb.io,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/validate-fs-functionstream-github-io-v1alpha1-function,mutating=false,failurePolicy=fail,sideEffects=None,groups=fs.functionstream.github.io,resources=functions,verbs=create;update;delete,versions=v1alpha1,name=vfunction-v1alpha1.kb.io,admissionReviewVersions=v1
 
 // FunctionCustomValidator struct is responsible for validating the Function resource
 // when it is created, updated, or deleted.

operator/internal/webhook/v1alpha1/packages_webhook.go

@@ -74,7 +74,7 @@ func (d *PackagesCustomDefaulter) Default(ctx context.Context, obj runtime.Objec
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
 // NOTE: The 'path' attribute must follow a specific pattern and should not be modified directly here.
 // Modifying the path for an invalid path can cause API server errors; failing to locate the webhook.
-// +kubebuilder:webhook:path=/validate-fs-functionstream-github-io-v1alpha1-package,mutating=false,failurePolicy=fail,sideEffects=None,groups=fs.functionstream.github.io,resources=package,verbs=create;update,versions=v1alpha1,name=vpackage-v1alpha1.kb.io,admissionReviewVersions=v1
+// +kubebuilder:webhook:path=/validate-fs-functionstream-github-io-v1alpha1-package,mutating=false,failurePolicy=fail,sideEffects=None,groups=fs.functionstream.github.io,resources=packages,verbs=create;update;delete,versions=v1alpha1,name=vpackage-v1alpha1.kb.io,admissionReviewVersions=v1
 
 // PackagesCustomValidator struct is responsible for validating the Packages resource
 // when it is created, updated, or deleted.