k8s: generate the console configmap after the cluster spec is changed

src/go/k8s/apis/vectorized/v1alpha1/console_types.go

@@ -220,6 +220,9 @@ type ConsoleStatus struct {
 	// The generation observed by the controller
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
+	// The generation of the Repanda cluster
+	ClusterGeneration int64 `json:"clusterGeneration,omitempty"`
+
 	Connectivity *Connectivity `json:"connectivity,omitempty"`
 
 	// Total number of non-terminated pods targeted by this deployment (their labels match the selector).

src/go/k8s/config/crd/bases/redpanda.vectorized.io_consoles.yaml

@@ -771,6 +771,10 @@ spec:
                   targeted by this deployment.
                 format: int32
                 type: integer
+              clusterGeneration:
+                description: The generation of the Repanda cluster
+                format: int64
+                type: integer
               configMapRef:
                 description: The ConfigMap used by Console This is used to pass the
                   ConfigMap used to mount in the Deployment Resource since Ensure()

src/go/k8s/controllers/redpanda/console_controller.go

@@ -228,18 +228,17 @@ func (r *Reconciling) Do(
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("reporting console status: %w", err)
 	}
-	if err := r.Status().Update(ctx, console); err != nil {
-		return ctrl.Result{}, err
-	}
 
-	if !console.GenerationMatchesObserved() {
-		r.Log.Info("observed generation updating", "observed generation", console.Status.ObservedGeneration, "generation", console.GetGeneration())
+	if !console.GenerationMatchesObserved() || cluster.GetGeneration() != console.Status.ClusterGeneration {
+		r.Log.Info("observed generation updating", "observed generation", console.Status.ObservedGeneration, "generation", console.GetGeneration(),
+			"observed cluster generation", console.Status.ClusterGeneration, "cluster generation", cluster.GetGeneration())
 		console.Status.ObservedGeneration = console.GetGeneration()
-		if err := r.Status().Update(ctx, console); err != nil {
-			return ctrl.Result{}, err
-		}
+		console.Status.ClusterGeneration = cluster.GetGeneration()
 	}
 
+	if err := r.Status().Update(ctx, console); err != nil {
+		return ctrl.Result{}, err
+	}
 	return ctrl.Result{}, nil
 }
 

src/go/k8s/pkg/console/configmap.go

@@ -66,7 +66,13 @@ func (cm *ConfigMap) Ensure(ctx context.Context) error {
 			}
 			return &resources.RequeueError{Msg: err.Error()}
 		}
-		return err
+
+		if cm.clusterobj.GetGeneration() == cm.consoleobj.Status.ClusterGeneration || err != nil {
+			return err
+		}
+
+		log.V(logger.InfoLevel).Info("cluster spec changed; will generate new configmap", "cluster generation", cm.clusterobj.GetGeneration(),
+			"observed cluster generation", cm.consoleobj.Status.ClusterGeneration)
 	}
 
 	// If old ConfigMaps can't be deleted for any reason, it will not continue reconciliation