Fix controller patching issues

Makefile

@@ -100,7 +100,7 @@ docker-build: test ## Build docker image with the manager.
 docker-build-agent: test build-agent ## Build docker image with the manager.
 	mkdir -p demo/bin
 	cp bin/agent demo/bin/agent
-	$(CONTAINER_TOOL) build -t agent:latest ./demo
+	$(CONTAINER_TOOL) build -t agent:latest --no-cache --progress=plain ./demo
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.

demo/Dockerfile

@@ -2,9 +2,13 @@ FROM opensuse/tumbleweed:latest
 
 RUN zypper install -y systemd
 RUN zypper install -y fuse-overlayfs
+RUN zypper install -y patterns-kubernetes-kubeadm
 
+## FIXME: Using cri-o until the kubeadm pattern is fixed
+RUN systemctl disable containerd
+RUN zypper install -y cri-o
 COPY crio-docker-storage.conf /etc/crio/crio.conf.d/99-storage.conf
-RUN zypper install -y patterns-kubernetes-kubeadm
+RUN systemctl enable crio
 
 COPY bin/agent /agent
 COPY agent-config.yaml /oem/elemental/agent/config.yaml

internal/controller/elementalcluster_controller.go

@@ -64,7 +64,7 @@ func (r *ElementalClusterReconciler) SetupWithManager(ctx context.Context, mgr c
 //
 // For more details about the reconciliation loop, check the official CAPI documentation:
 // - https://cluster-api.sigs.k8s.io/developer/providers/cluster-infrastructure
-func (r *ElementalClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *ElementalClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, rerr error) {
 	logger := log.FromContext(ctx).
 		WithValues(ilog.KeyNamespace, req.Namespace).
 		WithValues(ilog.KeyElementalCluster, req.Name)
@@ -97,6 +97,12 @@ func (r *ElementalClusterReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("initializing patch helper: %w", err)
 	}
+	defer func() {
+		// Reconciliation step #8: Patch the resource to persist changes
+		if err := patchHelper.Patch(ctx, elementalCluster); err != nil {
+			rerr = fmt.Errorf("patching ElementalCluster: %w", err)
+		}
+	}()
 
 	// Reconciliation step #4: Reconcile provider-specific cluster infrastructure
 	if elementalCluster.GetDeletionTimestamp() == nil || elementalCluster.GetDeletionTimestamp().IsZero() {
@@ -111,11 +117,6 @@ func (r *ElementalClusterReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		}
 	}
 
-	// Reconciliation step #8: Patch the resource to persist changes
-	if err := patchHelper.Patch(ctx, elementalCluster); err != nil {
-		return ctrl.Result{}, fmt.Errorf("patching ElementalCluster: %w", err)
-	}
-
 	return ctrl.Result{}, nil
 }
 

internal/controller/elementalmachine_controller.go

@@ -184,7 +184,7 @@ func (r *ElementalMachineReconciler) ClusterToElementalMachines(ctx context.Cont
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 // For more details about the reconciliation loop, check the official CAPI documentation:
 // - https://cluster-api.sigs.k8s.io/developer/providers/machine-infrastructure
-func (r *ElementalMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *ElementalMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, rerr error) {
 	logger := log.FromContext(ctx).
 		WithValues(ilog.KeyNamespace, req.Namespace).
 		WithValues(ilog.KeyElementalMachine, req.Name)
@@ -229,6 +229,12 @@ func (r *ElementalMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("initializing patch helper: %w", err)
 	}
+	defer func() {
+		// Reconciliation step #12: Patch the resource to persist changes
+		if err := patchHelper.Patch(ctx, elementalMachine); err != nil {
+			rerr = fmt.Errorf("patching ElementalMachine: %w", err)
+		}
+	}()
 
 	if elementalMachine.GetDeletionTimestamp() == nil || elementalMachine.GetDeletionTimestamp().IsZero() {
 		// The object is not being deleted, so register the finalizer
@@ -254,7 +260,6 @@ func (r *ElementalMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			return ctrl.Result{}, fmt.Errorf("reconciling ElementalMachine: %w", err)
 		}
 		return result, nil
-
 	}
 
 	// The object is up for deletion
@@ -264,11 +269,6 @@ func (r *ElementalMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		}
 	}
 
-	// Reconciliation step #12: Patch the resource to persist changes
-	if err := patchHelper.Patch(ctx, elementalMachine); err != nil {
-		return ctrl.Result{}, fmt.Errorf("patching ElementalMachine: %w", err)
-	}
-
 	return ctrl.Result{}, nil
 }
 

internal/controller/elementalmachineregistration_controller.go

@@ -47,7 +47,7 @@ type ElementalMachineRegistrationReconciler struct {
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
-func (r *ElementalMachineRegistrationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *ElementalMachineRegistrationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, rerr error) {
 	logger := log.FromContext(ctx).
 		WithValues(ilog.KeyNamespace, req.Namespace).
 		WithValues(ilog.KeyElementalMachineRegistration, req.Name)
@@ -67,10 +67,11 @@ func (r *ElementalMachineRegistrationReconciler) Reconcile(ctx context.Context,
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("initializing patch helper: %w", err)
 	}
-
-	if err := patchHelper.Patch(ctx, elementalMachineRegistration); err != nil {
-		return ctrl.Result{}, fmt.Errorf("patching ElementalMachineRegistration: %w", err)
-	}
+	defer func() {
+		if err := patchHelper.Patch(ctx, elementalMachineRegistration); err != nil {
+			rerr = fmt.Errorf("patching ElementalMachineRegistration: %w", err)
+		}
+	}()
 
 	return ctrl.Result{}, nil
 }