operator: speedup reloading of hooks configmap via annotating pods

redpanda-data · May 24, 2022 · 5a64da8 · 5a64da8
1 parent 5c76782
commit 5a64da8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/go/k8s/config/rbac/role.yaml b/src/go/k8s/config/rbac/role.yaml
@@ -59,6 +59,8 @@ rules:
   - delete
   - get
   - list
+  - patch
+  - update
   - watch
 - apiGroups:
   - ""

diff --git a/src/go/k8s/controllers/redpanda/cluster_controller.go b/src/go/k8s/controllers/redpanda/cluster_controller.go
@@ -60,7 +60,7 @@ type ClusterReconciler struct {
 //+kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;
 //+kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;
-//+kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;delete
+//+kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;update;patch;delete
 //+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;
 //+kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;update;patch;
 //+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings,verbs=get;list;watch;create;update;patch;

diff --git a/src/go/k8s/pkg/resources/hooks_configmap.go b/src/go/k8s/pkg/resources/hooks_configmap.go
@@ -44,9 +44,7 @@ const (
 	defaultClusterHealthCheckTimeoutSeconds = 300
 )
 
-var (
-	hooksDigestAnnotationKey = redpandav1alpha1.GroupVersion.Group + "/hooks-digest"
-)
+var hooksHashAnnotationKey = redpandav1alpha1.GroupVersion.Group + "/hooks-hash"
 
 var _ Resource = &HooksConfigMapResource{}
 
@@ -372,7 +370,7 @@ func (r *HooksConfigMapResource) getHealthCheckTimeout() int {
 func (r *HooksConfigMapResource) forceConfigMapReload(
 	ctx context.Context, cm *corev1.ConfigMap,
 ) error {
-	digest, err := r.computeDigest(cm)
+	digest, err := r.computeHash(cm)
 	if err != nil {
 		return fmt.Errorf("could not compute digest for ConfigMap %s: %w", cm.Name, err)
 	}
@@ -396,7 +394,7 @@ func (r *HooksConfigMapResource) forceConfigMapReload(
 			if pod.Annotations == nil {
 				pod.Annotations = make(map[string]string, 1)
 			}
-			pod.Annotations[hooksDigestAnnotationKey] = digest
+			pod.Annotations[hooksHashAnnotationKey] = digest
 
 			return r.Update(ctx, pod)
 		})
@@ -407,7 +405,7 @@ func (r *HooksConfigMapResource) forceConfigMapReload(
 	return nil
 }
 
-func (r *HooksConfigMapResource) computeDigest(
+func (r *HooksConfigMapResource) computeHash(
 	cm *corev1.ConfigMap,
 ) (string, error) {
 	elements := make([]string, 0, len(cm.Data))

diff --git a/src/go/k8s/pkg/resources/statefulset_update.go b/src/go/k8s/pkg/resources/statefulset_update.go
@@ -119,6 +119,7 @@ func (r *StatefulSetResource) rollingUpdate(
 		ignoreKubernetesTokenVolumeMounts(),
 		ignoreDefaultToleration(),
 		ignoreExistingVolumes(volumes),
+		utils.IgnoreAnnotation(hooksHashAnnotationKey),
 	}
 
 	for i := range podList.Items {