another fix

redpanda-data · Sep 26, 2024 · e7b94a0 · e7b94a0
1 parent 9841584
commit e7b94a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/operator/internal/controller/redpanda/cluster_controller.go b/operator/internal/controller/redpanda/cluster_controller.go
@@ -221,7 +221,8 @@ func (r *ClusterReconciler) Reconcile(
 	}
 
 	if err = r.setPodNodeIDAnnotation(ctx, &vectorizedCluster, log, ar); err != nil {
-		log.Error(err, "setting pod node_id annotation")
+		// Setting NodeID annotations is best-effort. Log the error, but don't fail because of it.
+		log.Error(err, "failed to set node_id annotation")
 	}
 
 	result, errs := ar.Ensure()

diff --git a/operator/internal/controller/test/cluster_controller_scale_test.go b/operator/internal/controller/test/cluster_controller_scale_test.go
@@ -12,7 +12,6 @@ package test
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -70,7 +69,7 @@ var _ = Describe("Redpanda cluster scale resource", func() {
 	})
 
 	Context("When scaling down a cluster", func() {
-		FIt("Should always decommission the last pods of a cluster one at time", func() {
+		It("Should always decommission the last pods of a cluster one at time", func() {
 			By("Allowing creation of a new cluster with 3 replicas")
 			key, redpandaCluster := getClusterWithReplicas("decommission", 3)
 			Expect(k8sClient.Create(context.Background(), redpandaCluster)).Should(Succeed())
@@ -81,7 +80,6 @@ var _ = Describe("Redpanda cluster scale resource", func() {
 			testAdminAPI.AddBroker(rpadmin.Broker{NodeID: 2, MembershipStatus: rpadmin.MembershipStatusActive})
 			var sts appsv1.StatefulSet
 			Eventually(resourceDataGetter(key, &sts, func() interface{} {
-				fmt.Println("ready", sts.Status.ReadyReplicas)
 				return *sts.Spec.Replicas
 			}), timeout, interval).Should(Equal(int32(3)))
 			Eventually(resourceDataGetter(key, redpandaCluster, func() interface{} {
@@ -96,7 +94,6 @@ var _ = Describe("Redpanda cluster scale resource", func() {
 
 			By("Start decommissioning node with ordinal 2")
 			Eventually(resourceDataGetter(key, redpandaCluster, func() interface{} {
-				fmt.Println("XXXXXXX", "ready", redpandaCluster.Status.NodePools["default"].ReadyReplicas)
 				if redpandaCluster.GetDecommissionBrokerID() == nil {
 					return nil
 				}

diff --git a/operator/internal/controller/test/cluster_controller_test.go b/operator/internal/controller/test/cluster_controller_test.go
@@ -33,6 +33,7 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	"github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
+	"github.com/redpanda-data/redpanda-operator/operator/pkg/labels"
 	res "github.com/redpanda-data/redpanda-operator/operator/pkg/resources"
 )
 
@@ -920,6 +921,7 @@ func readyPodsForCluster(cluster *v1alpha1.Cluster) []*corev1.Pod {
 					"app.kubernetes.io/component": "redpanda",
 					"app.kubernetes.io/instance":  cluster.Name,
 					"app.kubernetes.io/name":      "redpanda",
+					labels.NodePoolKey:            "default",
 				},
 			},
 			Spec: corev1.PodSpec{

diff --git a/operator/pkg/resources/statefulset.go b/operator/pkg/resources/statefulset.go
@@ -191,16 +191,6 @@ func (r *StatefulSetResource) Ensure(ctx context.Context) error {
 		}
 	}
 
-	// Initialize NodePool status if not yet done.
-	// This is relevant for:
-	// - Migration cases, where a pre-nodepool operator was running so far.
-	// - New NodePool thast does not yet have a status.
-	if _, ok := r.pandaCluster.Status.NodePools[r.nodePool.Name]; !ok {
-		r.pandaCluster.Status.NodePools[r.nodePool.Name] = vectorizedv1alpha1.NodePoolStatus{
-			CurrentReplicas: ptr.Deref(r.nodePool.Replicas, 0), // Initial currentReplicas to desired replicas
-		}
-	}
-
 	obj, err := r.obj(ctx)
 	if err != nil {
 		return fmt.Errorf("unable to construct StatefulSet object: %w", err)