Controller: don't put the error in the status

.github/workflows/ci.yaml

@@ -175,7 +175,7 @@ jobs:
 
     - uses: actions/setup-go@v2
       with:
-        go-version: '1.20'
+        go-version: '1.21'
 
     - name: Build image
       run: |

.github/workflows/publish.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        go: ["1.20"]
+        go: ["1.21"]
     name: Go ${{ matrix.go }}
     steps:
       - name: Checkout Metal LB Operator

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.21 AS builder
 ARG GIT_COMMIT=dev
 ARG GIT_BRANCH=dev
 

Makefile

@@ -177,7 +177,7 @@ deploy-prometheus:
 # download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.1
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)

bundle/manifests/metallb-operator.clusterserviceversion.yaml

@@ -273,7 +273,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/metallb/metallb-operator
-    createdAt: "2024-02-26T17:05:26Z"
+    createdAt: "2024-03-05T10:00:08Z"
     description: An operator for deploying MetalLB on a kubernetes cluster.
     operators.operatorframework.io/builder: operator-sdk-v1.26.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2

config/rbac/role.yaml

@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: metallb-manager-role
 rules:
 - apiGroups:
@@ -106,7 +105,6 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  creationTimestamp: null
   name: metallb-manager-role
   namespace: metallb-system
 rules:

config/webhook/manifests.yaml

@@ -2,7 +2,6 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: metallb-operator-webhook-configuration
 webhooks:
 - admissionReviewVersions:

controllers/metallb_controller.go

@@ -99,7 +99,7 @@ func (r *MetalLBReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	if req.Name != defaultMetalLBCrName {
 		err := fmt.Errorf("MetalLB resource name must be '%s'", defaultMetalLBCrName)
 		logger.Error(err, "Invalid MetalLB resource name", "name", req.Name)
-		if err := status.Update(context.TODO(), r.Client, instance, status.ConditionDegraded, "IncorrectMetalLBResourceName", fmt.Sprintf("Incorrect MetalLB resource name: %s", req.Name)); err != nil {
+		if err := status.Update(context.TODO(), r.Client, instance, status.ConditionDegraded, "IncorrectMetalLBResourceName"); err != nil {
 			logger.Error(err, "Failed to update metallb status", "Desired status", status.ConditionDegraded)
 			return ctrl.Result{}, nil // Return success to avoid requeue
 		}
@@ -108,15 +108,16 @@ func (r *MetalLBReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	}
 
 	result, condition, err := r.reconcileResource(ctx, req, instance)
+	if err != nil {
+		logger.Error(err, "Reconcile failed", "MetalLB", *instance)
+	}
+
 	if condition != "" {
-		errorMsg, wrappedErrMsg := condition, ""
+		errorMsg := condition
 		if err != nil {
-			errorMsg = "internal error"
-			if errors.Unwrap(err) != nil {
-				wrappedErrMsg = errors.Unwrap(err).Error()
-			}
+			errorMsg = "internalerror"
 		}
-		if err := status.Update(context.TODO(), r.Client, instance, condition, errorMsg, wrappedErrMsg); err != nil {
+		if err := status.Update(context.TODO(), r.Client, instance, condition, errorMsg); err != nil {
 			logger.Error(err, "Failed to update metallb status", "Desired status", condition)
 			return ctrl.Result{}, err
 		}

go.mod

@@ -1,6 +1,6 @@
 module github.com/metallb/metallb-operator
 
-go 1.20
+go 1.21
 
 require (
 	github.com/go-logr/logr v1.4.1

pkg/status/status.go

@@ -33,20 +33,20 @@ const (
 	ConditionUpgradeable = "Upgradeable"
 )
 
-func Update(ctx context.Context, client k8sclient.Client, metallb *metallbv1beta1.MetalLB, condition string, reason string, message string) error {
-	conditions := getConditions(condition, reason, message)
+func Update(ctx context.Context, client k8sclient.Client, metallb *metallbv1beta1.MetalLB, condition, reason string) error {
+	conditions := getConditions(condition, reason)
 	if equality.Semantic.DeepEqual(conditions, metallb.Status.Conditions) {
 		return nil
 	}
-	metallb.Status.Conditions = getConditions(condition, reason, message)
+	metallb.Status.Conditions = getConditions(condition, reason)
 
 	if err := client.Status().Update(ctx, metallb); err != nil {
 		return errors.Wrapf(err, "could not update status for object %+v", metallb)
 	}
 	return nil
 }
 
-func getConditions(condition string, reason string, message string) []metav1.Condition {
+func getConditions(condition string, reason string) []metav1.Condition {
 	conditions := getBaseConditions()
 	switch condition {
 	case ConditionAvailable:
@@ -55,11 +55,9 @@ func getConditions(condition string, reason string, message string) []metav1.Con
 	case ConditionProgressing:
 		conditions[2].Status = metav1.ConditionTrue
 		conditions[2].Reason = reason
-		conditions[2].Message = message
 	case ConditionDegraded:
 		conditions[3].Status = metav1.ConditionTrue
 		conditions[3].Reason = reason
-		conditions[3].Message = message
 	}
 	return conditions
 }

pkg/status/status_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestGetConditionsAvailable(t *testing.T) {
 	g := NewGomegaWithT(t)
-	conditions := getConditions(ConditionAvailable, "testReason", "testMessage")
+	conditions := getConditions(ConditionAvailable, "testReason")
 	validateUnsetConditions(g, conditions, []int{2, 3})
 	validateConditionTypes(g, conditions)
 	g.Expect(conditions[0].Status).To(Equal(metav1.ConditionTrue))
@@ -18,21 +18,19 @@ func TestGetConditionsAvailable(t *testing.T) {
 
 func TestGetConditionsProgressing(t *testing.T) {
 	g := NewGomegaWithT(t)
-	conditions := getConditions(ConditionProgressing, "testReason", "testMessage")
+	conditions := getConditions(ConditionProgressing, "testReason")
 	validateUnsetConditions(g, conditions, []int{0, 1, 3})
 	validateConditionTypes(g, conditions)
 	g.Expect(conditions[2].Status).To(Equal(metav1.ConditionTrue))
-	g.Expect(conditions[2].Message).To(Equal("testMessage"))
 	g.Expect(conditions[2].Reason).To(Equal("testReason"))
 }
 
 func TestGetConditionsDegraded(t *testing.T) {
 	g := NewGomegaWithT(t)
-	conditions := getConditions(ConditionDegraded, "testReason", "testMessage")
+	conditions := getConditions(ConditionDegraded, "testReason")
 	validateUnsetConditions(g, conditions, []int{0, 1, 2})
 	validateConditionTypes(g, conditions)
 	g.Expect(conditions[3].Status).To(Equal(metav1.ConditionTrue))
-	g.Expect(conditions[3].Message).To(Equal("testMessage"))
 	g.Expect(conditions[3].Reason).To(Equal("testReason"))
 }