[2.4.x] [#2300]Update the anti-affinity documentation

documentation/asciidoc/topics/proc_configuring_anti_affinity.adoc

@@ -6,6 +6,6 @@ Specify where {k8s} schedules pods for your {brandname} clusters to ensure avail
 
 .Procedure
 
-. Add the `spec.affinity` block to your `Infinispan` CR.
+. Add the `spec.scheduling.affinity` block to your `Infinispan` CR.
 . Configure anti-affinity strategies as necessary.
 . Apply your `Infinispan` CR.

documentation/asciidoc/topics/ref_anti_affinity.adoc

@@ -20,7 +20,7 @@ Configure anti-affinity strategies in your `Infinispan` CR to control where {k8s
 [discrete]
 == Schedule pods on different {k8s} nodes
 
-The following is the anti-affinity strategy that {ispn_operator} uses if you do not configure the `spec.affinity` field in your `Infinispan` CR:
+The following is the anti-affinity strategy that {ispn_operator} uses if you do not configure the `spec.scheduling.affinity` field in your `Infinispan` CR:
 
 [source,yaml,options="nowrap",subs=attributes+]
 ----

documentation/asciidoc/topics/ref_datagrid_service_resources.adoc

@@ -66,7 +66,7 @@ You should do this only if you do not need declarative Kubernetes representation
 |`spec.configListener.logging.level`
 |Configures the logging level for the `ConfigListener` deployments. The default level is `info`. You can change it to `debug` or  `error`.
 
-|`spec.affinity`
+|`spec.scheduling.affinity`
 |Configures anti-affinity strategies that guarantee {brandname} availability.
 
 |===

documentation/asciidoc/topics/yaml/affinity_nodes_prefer.yaml

@@ -1,12 +1,13 @@
 spec:
-  affinity:
-    podAntiAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 100
-        podAffinityTerm:
-          labelSelector:
-            matchLabels:
-              app: infinispan-pod
-              clusterName: <cluster_name>
-              infinispan_cr: <cluster_name>
-          topologyKey: "kubernetes.io/hostname"
+  scheduling:
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app: infinispan-pod
+                clusterName: <cluster_name>
+                infinispan_cr: <cluster_name>
+            topologyKey: "kubernetes.io/hostname"

documentation/asciidoc/topics/yaml/affinity_nodes_require.yaml

@@ -1,10 +1,11 @@
 spec:
-  affinity:
-    podAntiAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-      - labelSelector:
-          matchLabels:
-            app: infinispan-pod
-            clusterName: <cluster_name>
-            infinispan_cr: <cluster_name>
-        topologyKey: "topology.kubernetes.io/hostname"
+  scheduling:
+    affinity:
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchLabels:
+              app: infinispan-pod
+              clusterName: <cluster_name>
+              infinispan_cr: <cluster_name>
+          topologyKey: "topology.kubernetes.io/hostname"

documentation/asciidoc/topics/yaml/affinity_zones_prefer.yaml

@@ -1,20 +1,21 @@
 spec:
-  affinity:
-    podAntiAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 100
-        podAffinityTerm:
-          labelSelector:
-            matchLabels:
-              app: infinispan-pod
-              clusterName: <cluster_name>
-              infinispan_cr: <cluster_name>
-          topologyKey: "topology.kubernetes.io/zone"
-      - weight: 90
-        podAffinityTerm:
-          labelSelector:
-            matchLabels:
-              app: infinispan-pod
-              clusterName: <cluster_name>
-              infinispan_cr: <cluster_name>
-          topologyKey: "kubernetes.io/hostname"
+  scheduling:
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app: infinispan-pod
+                clusterName: <cluster_name>
+                infinispan_cr: <cluster_name>
+            topologyKey: "topology.kubernetes.io/zone"
+        - weight: 90
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app: infinispan-pod
+                clusterName: <cluster_name>
+                infinispan_cr: <cluster_name>
+            topologyKey: "kubernetes.io/hostname"

documentation/asciidoc/topics/yaml/affinity_zones_require.yaml

@@ -1,10 +1,11 @@
 spec:
-  affinity:
-    podAntiAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-      - labelSelector:
-          matchLabels:
-            app: infinispan-pod
-            clusterName: <cluster_name>
-            infinispan_cr: <cluster_name>
-        topologyKey: "topology.kubernetes.io/zone"
+  scheduling:
+    affinity:
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchLabels:
+              app: infinispan-pod
+              clusterName: <cluster_name>
+              infinispan_cr: <cluster_name>
+          topologyKey: "topology.kubernetes.io/zone"

documentation/asciidoc/topics/yaml/datagrid_service.yaml

@@ -50,14 +50,15 @@ spec:
   configMapName: "my-cluster-config"
   configListener:
     enabled: true
-  affinity:
-    podAntiAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 100
-        podAffinityTerm:
-          labelSelector:
-            matchLabels:
-              app: infinispan-pod
-              clusterName: {example_crd_name}
-              infinispan_cr: {example_crd_name}
-          topologyKey: "kubernetes.io/hostname"
+  scheduling:
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app: infinispan-pod
+                clusterName: {example_crd_name}
+                infinispan_cr: {example_crd_name}
+            topologyKey: "kubernetes.io/hostname"

test-integration/operator-tests/src/test/resources/infinispans/datagrid_service.yaml

@@ -3,15 +3,16 @@ kind: Infinispan
 metadata:
   name: datagrid-service
 spec:
-  affinity:
-    podAntiAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-      - labelSelector:
-          matchLabels:
-            app: infinispan-pod
-            clusterName: datagrid-service
-            infinispan_cr: datagrid-service
-        topologyKey: "topology.kubernetes.io/zone"
+  scheduling:
+    affinity:
+      podAntiAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchLabels:
+              app: infinispan-pod
+              clusterName: datagrid-service
+              infinispan_cr: datagrid-service
+          topologyKey: "topology.kubernetes.io/zone"
   expose:
     type: Route
   container: