fix: Fix the key of the restarter annotation

Author: siegfriedweber

rust/operator-binary/src/controller/build/role_group_builder.rs

@@ -386,7 +386,7 @@ impl<'a> RoleGroupBuilder<'a> {
             .enumerate()
             .map(|(i, config_map_name)| {
                 (
-                    format!("restarter.stackable.tech/ignore-config-map.{i}"),
+                    format!("restarter.stackable.tech/ignore-configmap.{i}"),
                     config_map_name.to_string(),
                 )
             });
@@ -1787,8 +1787,8 @@ mod tests {
 
         let expected_annotations = match security_mode {
             TestSecurityMode::Initializing | TestSecurityMode::Managing => json!({
-                "restarter.stackable.tech/ignore-config-map.0": "my-opensearch-cluster-security-config",
-                "restarter.stackable.tech/ignore-config-map.1": "opensearch-security-config",
+                "restarter.stackable.tech/ignore-configmap.0": "my-opensearch-cluster-security-config",
+                "restarter.stackable.tech/ignore-configmap.1": "opensearch-security-config",
                 "restarter.stackable.tech/ignore-secret.0": "opensearch-security-config",
             }),
             TestSecurityMode::Disabled | TestSecurityMode::Participating => json!({}),

tests/templates/kuttl/security-config/11-assert.yaml

@@ -24,7 +24,19 @@ kind: StatefulSet
 metadata:
   name: opensearch-nodes-security-config
   annotations:
-    restarter.stackable.tech/ignore-config-map.0: "opensearch-security-config"
+    restarter.stackable.tech/ignore-configmap.0: opensearch-security-config
+    restarter.stackable.tech/ignore-configmap.1: security-config
+    restarter.stackable.tech/ignore-secret.0: security-config-file-internal-users
+  labels:
+    restarter.stackable.tech/enabled: "true"
+spec:
+  template:
+    metadata:
+      annotations:
+        # configmap.restarter.stackable.tech/opensearch-nodes-security-config: <uid>/<resourceVersion>
+        configmap.restarter.stackable.tech/opensearch-security-config: changes-ignored
+        configmap.restarter.stackable.tech/security-config: changes-ignored
+        secret.restarter.stackable.tech/security-config-file-internal-users: changes-ignored
 status:
   readyReplicas: 1
   replicas: 1

tests/templates/kuttl/smoke/10-assert.yaml.j2

@@ -11,7 +11,7 @@ kind: StatefulSet
 metadata:
   name: opensearch-nodes-cluster-manager
   annotations:
-    restarter.stackable.tech/ignore-config-map.0: opensearch-security-config
+    restarter.stackable.tech/ignore-configmap.0: opensearch-security-config
   labels:
     app.kubernetes.io/component: nodes
     app.kubernetes.io/instance: opensearch
@@ -40,8 +40,8 @@ spec:
   template:
     metadata:
       annotations:
-        # configmap.restarter.stackable.tech/opensearch-nodes-cluster-manager: <UID>
-        # configmap.restarter.stackable.tech/opensearch-security-config: <UID>
+        # configmap.restarter.stackable.tech/opensearch-nodes-cluster-manager: <uid>/<resourceVersion>
+        configmap.restarter.stackable.tech/opensearch-security-config: changes-ignored
         kubectl.kubernetes.io/default-container: opensearch
       labels:
         app.kubernetes.io/component: nodes
@@ -493,7 +493,7 @@ kind: StatefulSet
 metadata:
   name: opensearch-nodes-data
   annotations:
-    restarter.stackable.tech/ignore-config-map.0: opensearch-security-config
+    restarter.stackable.tech/ignore-configmap.0: opensearch-security-config
   labels:
     app.kubernetes.io/component: nodes
     app.kubernetes.io/instance: opensearch
@@ -522,8 +522,8 @@ spec:
   template:
     metadata:
       annotations:
-        # configmap.restarter.stackable.tech/opensearch-nodes-data: <UID>
-        # configmap.restarter.stackable.tech/opensearch-security-config: <UID>
+        # configmap.restarter.stackable.tech/opensearch-nodes-data: <uid>/<resourceVersion>
+        configmap.restarter.stackable.tech/opensearch-security-config: changes-ignored
         kubectl.kubernetes.io/default-container: opensearch
       labels:
         app.kubernetes.io/component: nodes