Merge pull request #742 from humio/mike/sa-annotations-after-sa-creation

Ensure we update ServiceAccount annotations after ServiceAccount crea…

Author: Mike Rostermund

controllers/humiocluster_controller.go

@@ -209,19 +209,6 @@ func (r *HumioClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		}
 	}
 
-	for _, pool := range humioNodePools.Filter(NodePoolFilterHasNode) {
-		if issueRestart, err := r.ensureHumioServiceAccountAnnotations(ctx, pool); err != nil || issueRestart {
-			opts := statusOptions()
-			if issueRestart {
-				_, err = r.incrementHumioClusterPodRevision(ctx, hc, pool)
-			}
-			if err != nil {
-				opts.withMessage(err.Error())
-			}
-			return r.updateStatus(ctx, r.Client.Status(), hc, opts.withState(hc.Status.State))
-		}
-	}
-
 	for _, fun := range []ctxHumioClusterFunc{
 		r.ensureValidCAIssuer,
 		r.ensureHumioClusterCACertBundle,
@@ -253,6 +240,19 @@ func (r *HumioClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		}
 	}
 
+	for _, pool := range humioNodePools.Filter(NodePoolFilterHasNode) {
+		if issueRestart, err := r.ensureHumioServiceAccountAnnotations(ctx, pool); err != nil || issueRestart {
+			opts := statusOptions()
+			if issueRestart {
+				_, err = r.incrementHumioClusterPodRevision(ctx, hc, pool)
+			}
+			if err != nil {
+				opts.withMessage(err.Error())
+			}
+			return r.updateStatus(ctx, r.Client.Status(), hc, opts.withState(hc.Status.State))
+		}
+	}
+
 	for _, pool := range humioNodePools.Filter(NodePoolFilterHasNode) {
 		if err := r.ensurePersistentVolumeClaimsExist(ctx, hc, pool); err != nil {
 			opts := statusOptions()