feat(opencti): upgrade deps

* opencti base: 6.1.6 * Upgrade deps: * elasticsearch: 19.19.* -> 21.1.* * minio: 13.7.* -> 14.6.* * opensearch: 2.18.* -> 2.20.* * rabbitmq: 12.14.* -> 14.3.* * redis: 18.18.* -> 19.5.* * Fix HPA on opencti/server * Added test for HPA (worker and server)
devops-ia · May 30, 2024 · d336de0 · d336de0
1 parent d30dfaa
commit d336de0
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/charts/opencti/Chart.yaml b/charts/opencti/Chart.yaml
@@ -8,29 +8,29 @@ maintainers:
     url: https://ialejandro.rocks
 sources:
   - https://github.com/OpenCTI-Platform/opencti
-version: 1.2.3
-appVersion: "6.0.5"
+version: 1.2.4
+appVersion: "6.1.6"
 home: https://www.filigran.io/en/solutions/products/opencti/
 keywords:
   - opencti
 dependencies:
   - name: elasticsearch
-    version: 19.19.*
+    version: 21.1.*
     repository: https://charts.bitnami.com/bitnami
     condition: elasticsearch.enabled
   - name: minio
-    version: 13.7.*
+    version: 14.6.*
     repository: https://charts.bitnami.com/bitnami
     condition: minio.enabled
   - name: opensearch
-    version: 2.18.*
+    version: 2.20.*
     repository: https://opensearch-project.github.io/helm-charts/
     condition: opensearch.enabled
   - name: rabbitmq
-    version: 12.14.*
+    version: 14.3.*
     repository: https://charts.bitnami.com/bitnami
     condition: rabbitmq.enabled
   - name: redis
-    version: 18.18.*
+    version: 19.5.*
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
diff --git a/charts/opencti/README.md b/charts/opencti/README.md
@@ -16,11 +16,11 @@ A Helm chart to deploy open cyber threat intelligence platform
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.bitnami.com/bitnami | elasticsearch | 19.19.* |
-| https://charts.bitnami.com/bitnami | minio | 13.7.* |
-| https://charts.bitnami.com/bitnami | rabbitmq | 12.14.* |
-| https://charts.bitnami.com/bitnami | redis | 18.18.* |
-| https://opensearch-project.github.io/helm-charts/ | opensearch | 2.18.* |
+| https://charts.bitnami.com/bitnami | elasticsearch | 21.1.* |
+| https://charts.bitnami.com/bitnami | minio | 14.6.* |
+| https://charts.bitnami.com/bitnami | rabbitmq | 14.3.* |
+| https://charts.bitnami.com/bitnami | redis | 19.5.* |
+| https://opensearch-project.github.io/helm-charts/ | opensearch | 2.20.* |
 
 ## Add repository
 
@@ -87,11 +87,11 @@ helm show values devops-ia/opencti
 | elasticsearch.enabled | bool | `true` | Enable or disable ElasticSearch subchart |
 | elasticsearch.ingest | object | `{"enabled":false}` | Ingest-only nodes parameters |
 | elasticsearch.ingest.enabled | bool | `false` | Enable ingest nodes |
-| elasticsearch.master.masterOnly | bool | `true` | Deploy the Elasticsearch master-elegible nodes as master-only nodes. Recommended for high-demand deployments. |
+| elasticsearch.master.masterOnly | bool | `true` | Deploy the Elasticsearch master-eligible nodes as master-only nodes. Recommended for high-demand deployments. |
 | elasticsearch.master.persistence | object | `{"enabled":false}` | Enable persistence using Persistent Volume Claims ref: https://kubernetes.io/docs/user-guide/persistent-volumes/ |
 | elasticsearch.master.persistence.enabled | bool | `false` | Enable persistence using a `PersistentVolumeClaim` |
-| elasticsearch.master.replicaCount | int | `1` | Number of master-elegible replicas to deploy |
-| env | object | `{"APP__ADMIN__EMAIL":"[email protected]","APP__ADMIN__PASSWORD":"ChangeMe","APP__ADMIN__TOKEN":"ChangeMe","APP__BASE_PATH":"/","APP__HEALTH_ACCESS_KEY":"ChangeMe","APP__TELEMETRY__METRICS__ENABLED":true,"ELASTICSEARCH__URL":"http://release-name-elasticsearch:9200","MINIO__ENDPOINT":"release-name-minio:9000","RABBITMQ__HOSTNAME":"release-name-rabbitmq","RABBITMQ__PASSWORD":"ChangeMe","RABBITMQ__PORT":5672,"RABBITMQ__PORT_MANAGEMENT":15672,"RABBITMQ__USERNAME":"user","REDIS__HOSTNAME":"release-name-redis-master","REDIS__MODE":"single","REDIS__PORT":6379}` | Environment variables to configure application ref: https://docs.opencti.io/5.12.X/deployment/configuration/#platform |
+| elasticsearch.master.replicaCount | int | `1` | Number of master-eligible replicas to deploy |
+| env | object | `{"APP__ADMIN__EMAIL":"[email protected]","APP__ADMIN__PASSWORD":"ChangeMe","APP__ADMIN__TOKEN":"ChangeMe","APP__BASE_PATH":"/","APP__GRAPHQL__PLAYGROUND__ENABLED":false,"APP__GRAPHQL__PLAYGROUND__FORCE_DISABLED_INTROSPECTION":false,"APP__HEALTH_ACCESS_KEY":"ChangeMe","APP__TELEMETRY__METRICS__ENABLED":true,"ELASTICSEARCH__URL":"http://release-name-elasticsearch:9200","MINIO__ENDPOINT":"release-name-minio:9000","RABBITMQ__HOSTNAME":"release-name-rabbitmq","RABBITMQ__PASSWORD":"ChangeMe","RABBITMQ__PORT":5672,"RABBITMQ__PORT_MANAGEMENT":15672,"RABBITMQ__USERNAME":"user","REDIS__HOSTNAME":"release-name-redis-master","REDIS__MODE":"single","REDIS__PORT":6379}` | Environment variables to configure application ref: https://docs.opencti.io/5.12.X/deployment/configuration/#platform |
 | envFromSecrets | object | `{}` | Secrets from variables |
 | fullnameOverride | string | `""` | String to fully override opencti.fullname template |
 | global | object | `{"imagePullSecrets":[],"imageRegistry":""}` | Global configuration |
@@ -145,8 +145,8 @@ helm show values devops-ia/opencti
 | redis.replica.replicaCount | int | `1` | Number of Redis replicas to deploy |
 | replicaCount | int | `1` | Number of replicas |
 | resources | object | `{}` | The resources limits and requested |
-| secrets | object | `{}` | Secrets values to create credencials and reference by envFromSecrets |
-| service | object | `{"port":80,"targetPort":4000,"type":"ClusterIP"}` | Kubernetes servide to expose Pod |
+| secrets | object | `{}` | Secrets values to create credentials and reference by envFromSecrets |
+| service | object | `{"port":80,"targetPort":4000,"type":"ClusterIP"}` | Kubernetes service to expose Pod |
 | service.port | int | `80` | Kubernetes Service port |
 | service.targetPort | int | `4000` | Pod expose port |
 | service.type | string | `"ClusterIP"` | Kubernetes Service type. Allowed values: NodePort, LoadBalancer or ClusterIP |

diff --git a/charts/opencti/ci/ci-values.yaml b/charts/opencti/ci/ci-values.yaml
@@ -8,6 +8,8 @@ env:
   APP__BASE_PATH: "/"
   APP__HEALTH_ACCESS_KEY: f93747ff-2ea1-4717-900c-9df20b8e4429
   APP__TELEMETRY__METRICS__ENABLED: true
+  APP__GRAPHQL__PLAYGROUND__ENABLED: false
+  APP__GRAPHQL__PLAYGROUND__FORCE_DISABLED_INTROSPECTION: false
   ELASTICSEARCH__ENGINE_SELECTOR: elk
   ELASTICSEARCH__URL: http://opencti-ci-elasticsearch:9200
   MINIO__ENDPOINT: opencti-ci-minio
@@ -25,11 +27,22 @@ testConnection: false
 serviceMonitor:
   enabled: false
 
+autoscaling:
+  enabled: true
+
 worker:
-  enabled: false
+  enabled: true
+
+  autoscaling:
+    enabled: true
 
 elasticsearch:
   fullnameOverride: opencti-ci-elasticsearch
+  master:
+    resourcesPreset: "nano"
+  data:
+    resourcesPreset: "nano"
+    heapSize: 128m
 
 minio:
   fullnameOverride: opencti-ci-minio

diff --git a/charts/opencti/templates/server/hpa.yaml b/charts/opencti/templates/server/hpa.yaml
@@ -17,12 +17,16 @@ spec:
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.worker.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}
diff --git a/charts/opencti/values.yaml b/charts/opencti/values.yaml
@@ -50,6 +50,8 @@ env:
   APP__ADMIN__PASSWORD: ChangeMe
   APP__ADMIN__TOKEN: ChangeMe
   APP__BASE_PATH: "/"
+  APP__GRAPHQL__PLAYGROUND__ENABLED: false
+  APP__GRAPHQL__PLAYGROUND__FORCE_DISABLED_INTROSPECTION: false
   # MINIO:
   MINIO__ENDPOINT: release-name-minio:9000
   # ELASTICSEARCH