feat(opensearch): unify node pools with all roles as default

opensearch/README.md

@@ -164,7 +164,7 @@ This guide provides a quick and straightforward way to use **OpenSearch** as a G
 | cluster.cluster.initHelper.version | string | `"1.36"` | initHelper version |
 | cluster.cluster.labels | object | `{}` | OpenSearchCluster labels |
 | cluster.cluster.name | string | `"opensearch-logs"` | OpenSearchCluster name, by default release name is used |
-| cluster.cluster.nodePools | list | <pre>nodePools:<br>  - component: main<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>    resources:<br>      requests:<br>        memory: "1Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "2Gi"<br>        cpu: 1</pre> | Opensearch nodes configuration |
+| cluster.cluster.nodePools | list | <pre>nodePools:<br>  - component: nodes<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>      - "data"<br>      - "ingest"<br>    resources:<br>      requests:<br>        memory: "2Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "4Gi"<br>        cpu: 2</pre> | Opensearch nodes configuration |
 | cluster.cluster.security.config.adminCredentialsSecret | object | `{"name":"admin-credentials"}` | Secret that contains fields username and password to be used by the operator to access the opensearch cluster for node draining. Must be set if custom securityconfig is provided. |
 | cluster.cluster.security.config.adminSecret | object | `{"name":"opensearch-admin-cert"}` | TLS Secret that contains a client certificate (tls.key, tls.crt, ca.crt) with admin rights in the opensearch cluster. Must be set if transport certificates are provided by user and not generated |
 | cluster.cluster.security.config.securityConfigSecret | object | `{"name":"opensearch-security-config"}` | Secret that contains the differnt yml files of the opensearch-security config (config.yml, internal_users.yml, etc) |
@@ -349,7 +349,7 @@ This guide provides a quick and straightforward way to use **OpenSearch** as a G
 | siem.cluster.initHelper.version | string | `"1.36"` | initHelper version |
 | siem.cluster.labels | object | `{}` | OpenSearchCluster labels |
 | siem.cluster.name | string | `"opensearch-siem"` | OpenSearchCluster name. If empty, subchart defaults to release name. For proper naming, set this to "{{Release.Name}}-siem" or leave empty and set via values file. Note: Helm values.yaml doesn't support templating, so this must be set explicitly or via --set/values file. |
-| siem.cluster.nodePools | list | <pre>nodePools:<br>  - component: main<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>    resources:<br>      requests:<br>        memory: "1Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "2Gi"<br>        cpu: 1</pre> | Opensearch nodes configuration |
+| siem.cluster.nodePools | list | <pre>nodePools:<br>  - component: nodes<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>      - "data"<br>      - "ingest"<br>    resources:<br>      requests:<br>        memory: "2Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "4Gi"<br>        cpu: 2</pre> | Opensearch nodes configuration |
 | siem.cluster.security.config.adminCredentialsSecret | object | `{"name":"siemadmin-credentials"}` | Secret that contains fields username and password to be used by the operator to access the opensearch cluster for node draining. Must be set if custom securityconfig is provided. |
 | siem.cluster.security.config.adminSecret | object | `{"name":"opensearch-siem-admin-cert"}` | TLS Secret that contains a client certificate (tls.key, tls.crt, ca.crt) with admin rights in the opensearch cluster. Must be set if transport certificates are provided by user and not generated |
 | siem.cluster.security.config.securityConfigSecret | object | `{"name":"opensearch-siem-security-config"}` | Secret that contains the differnt yml files of the opensearch-security config (config.yml, internal_users.yml, etc) |

opensearch/chart/Chart.yaml

@@ -3,7 +3,7 @@
 
 apiVersion: v2
 name: opensearch
-version: 0.0.55
+version: 0.0.56
 description: A Helm chart for the OpenSearch operator
 type: application
 maintainers:

opensearch/chart/ci/test-values.yaml

@@ -80,45 +80,23 @@ cluster:
             secretName: opensearch-http-cert
 
     nodePools:
-      - component: main
+      - component: nodes
         diskSize: "2Gi"
-        replicas: 1
+        replicas: 2
         roles:
           - "cluster_manager"
-        resources:
-          requests:
-            memory: "512Mi"
-            cpu: "200m"
-          limits:
-            memory: "2Gi"
-            cpu: 1
-      - component: data
-        diskSize: "2Gi"
-        replicas: 1
-        roles:
           - "data"
+          - "ingest"
         resources:
           requests:
             memory: "512Mi"
             cpu: "200m"
           limits:
             memory: "4Gi"
             cpu: 2
-      - component: client
-        diskSize: "2Gi"
-        replicas: 1
-        roles:
-          - "client"
-        resources:
-          requests:
-            memory: "512Mi"
-            cpu: "200m"
-          limits:
-            memory: "2Gi"
-            cpu: 1
 
 siem:
-  enabled: true
+  enabled: false
   certManager:
     httpDnsNames:
       - opensearch-siem-client.local
@@ -191,39 +169,17 @@ siem:
             secretName: opensearch-siem-http-cert
 
     nodePools:
-      - component: main
+      - component: nodes
         diskSize: "5Gi"
-        replicas: 1
+        replicas: 2
         roles:
           - "cluster_manager"
-        resources:
-          requests:
-            memory: "1Gi"
-            cpu: "500m"
-          limits:
-            memory: "2Gi"
-            cpu: 1
-      - component: data
-        diskSize: "5Gi"
-        replicas: 1
-        roles:
           - "data"
+          - "ingest"
         resources:
           requests:
             memory: "1Gi"
             cpu: "500m"
           limits:
             memory: "4Gi"
             cpu: 2
-      - component: client
-        diskSize: "5Gi"
-        replicas: 1
-        roles:
-          - "client"
-        resources:
-          requests:
-            memory: "1Gi"
-            cpu: "500m"
-          limits:
-            memory: "2Gi"
-            cpu: 1

opensearch/chart/values.yaml

@@ -473,44 +473,22 @@ cluster:
       version: "1.36"
 
     # -- Opensearch nodes configuration
-    # @default -- <pre>nodePools:<br>  - component: main<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>    resources:<br>      requests:<br>        memory: "1Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "2Gi"<br>        cpu: 1</pre>
+    # @default -- <pre>nodePools:<br>  - component: nodes<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>      - "data"<br>      - "ingest"<br>    resources:<br>      requests:<br>        memory: "2Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "4Gi"<br>        cpu: 2</pre>
     nodePools:
-      - component: main
+      - component: nodes
         diskSize: "30Gi"
         replicas: 3
         roles:
           - "cluster_manager"
-        resources:
-          requests:
-            memory: "1Gi"
-            cpu: "500m"
-          limits:
-            memory: "2Gi"
-            cpu: 1
-      - component: data
-        diskSize: "30Gi"
-        replicas: 3
-        roles:
           - "data"
+          - "ingest"
         resources:
           requests:
-            memory: "1Gi"
+            memory: "2Gi"
             cpu: "500m"
           limits:
             memory: "4Gi"
             cpu: 2
-      - component: client
-        diskSize: "30Gi"
-        replicas: 1
-        roles:
-          - "client"
-        resources:
-          requests:
-            memory: "1Gi"
-            cpu: "500m"
-          limits:
-            memory: "2Gi"
-            cpu: 1
 
     # Configuration for the client service used to expose client nodes externally.
     client:
@@ -1195,44 +1173,22 @@ siem:
       version: "1.36"
 
     # -- Opensearch nodes configuration
-    # @default -- <pre>nodePools:<br>  - component: main<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>    resources:<br>      requests:<br>        memory: "1Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "2Gi"<br>        cpu: 1</pre>
+    # @default -- <pre>nodePools:<br>  - component: nodes<br>    diskSize: "30Gi"<br>    replicas: 3<br>    roles:<br>      - "cluster_manager"<br>      - "data"<br>      - "ingest"<br>    resources:<br>      requests:<br>        memory: "2Gi"<br>        cpu: "500m"<br>      limits:<br>        memory: "4Gi"<br>        cpu: 2</pre>
     nodePools:
-      - component: main
+      - component: nodes
         diskSize: "30Gi"
         replicas: 3
         roles:
           - "cluster_manager"
-        resources:
-          requests:
-            memory: "1Gi"
-            cpu: "500m"
-          limits:
-            memory: "2Gi"
-            cpu: 1
-      - component: data
-        diskSize: "30Gi"
-        replicas: 3
-        roles:
           - "data"
+          - "ingest"
         resources:
           requests:
-            memory: "1Gi"
+            memory: "2Gi"
             cpu: "500m"
           limits:
             memory: "4Gi"
             cpu: 2
-      - component: client
-        diskSize: "30Gi"
-        replicas: 1
-        roles:
-          - "client"
-        resources:
-          requests:
-            memory: "1Gi"
-            cpu: "500m"
-          limits:
-            memory: "2Gi"
-            cpu: 1
 
     # Configuration for the client service used to expose client nodes externally.
     client: