Add Auto-configure curator retention rule for indexPerNamespace

Author: chi-quita-a

config/sc-config.yaml

@@ -1009,6 +1009,11 @@ opensearch:
   # Config for https://www.elastic.co/guide/en/elasticsearch/client/curator/5.8/about.html
   curator:
     enabled: true
+    # Defaults used for automatic index-per-namespace patterns in the curator values:
+    #   - "^[^.].*"    (non-system indices)
+    #   - ".orphaned*" (orphaned indices from removed namespaces)
+    indexPerNamespaceDefaultSizeGB: 5000
+    indexPerNamespaceDefaultAgeDays: 30
     retention:
       - pattern: other-*
         sizeGB: 5000

config/schemas/config.yaml

@@ -6485,6 +6485,16 @@ properties:
             title: OpenSearch Curator Enabled
             type: boolean
             default: true
+          indexPerNamespaceDefaultSizeGB:
+            title: OpenSearch Curator Index-Per-Namespace Default Size GB
+            description: Default size threshold in GB for automatically generated index-per-namespace patterns.
+            type: number
+            default: 5000
+          indexPerNamespaceDefaultAgeDays:
+            title: OpenSearch Curator Index-Per-Namespace Default Age Days
+            description: Default age threshold in days for automatically generated index-per-namespace patterns.
+            type: number
+            default: 30
           retention:
             title: OpenSearch Curator Retention
             description: Configures the retention of indices in OpenSearch.

helmfile.d/charts/opensearch/curator/values.yaml

@@ -15,7 +15,6 @@ opensearch:
 
 startingDeadlineSeconds: 300
 activeDeadlineSeconds: 1800
-
 failedJobsHistoryLimit: 3
 successfulJobsHistoryLimit: 1
 

helmfile.d/values/opensearch/curator.yaml.gotmpl

@@ -10,7 +10,20 @@ tolerations:  {{- toYaml .Values.opensearch.curator.tolerations | nindent 2 }}
 nodeSelector: {{- toYaml .Values.opensearch.curator.nodeSelector | nindent 2 }}
 resources:    {{- toYaml .Values.opensearch.curator.resources | nindent 2 }}
 
-retention: {{ toYaml .Values.opensearch.curator.retention | nindent 2 }}
+retention:
+  {{- if .Values.opensearch.indexPerNamespace }}
+  - pattern: "^[^.].*"
+    sizeGB: {{ .Values.opensearch.curator.indexPerNamespaceDefaultSizeGB }}
+    ageDays: {{ .Values.opensearch.curator.indexPerNamespaceDefaultAgeDays }}
+  - pattern: ".orphaned*"
+    sizeGB: {{ .Values.opensearch.curator.indexPerNamespaceDefaultSizeGB }}
+    ageDays: {{ .Values.opensearch.curator.indexPerNamespaceDefaultAgeDays }}
+  {{- end }}
+  {{- range .Values.opensearch.curator.retention }}
+  - pattern: {{ .pattern | quote }}
+    sizeGB: {{ .sizeGB }}
+    ageDays: {{ .ageDays }}
+  {{- end }}
 
 {{- $global := dict
   "registry" (ternary (dig "uri" "" .Values.images.global.registry) "" .Values.images.global.registry.enabled)