Update CloudPrem Helm chart (#1804)

guilload · tbavelier · web-flow · commit 74fabcc660ed · 2025-04-18T10:29:04.000-04:00
Co-authored-by: Timothée Bavelier &lt;97530782+tbavelier@users.noreply.github.com&gt;
diff --git a/charts/cloudprem/CHANGELOG.md b/charts/cloudprem/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Changelog
+
+## 0.1.1
+
+* Load index config from file instead of inline definition
+* Switch to gRPC health check for public ALB
+* Upgrade image to v0.1.1
+
+## 0.1.0
+
+* Initial version
diff --git a/charts/cloudprem/Chart.yaml b/charts/cloudprem/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: cloudprem
 description: Datadog CloudPrem
 type: application
-version: v0.1.0
-appVersion: v0.1.0
+version: v0.1.1
+appVersion: v0.1.1
 home: https://www.datadoghq.com/
 icon: https://datadog-live.imgix.net/img/dd_logo_70x75.png
 maintainers:
diff --git a/charts/cloudprem/README.md b/charts/cloudprem/README.md
@@ -1,6 +1,6 @@
 # CloudPrem
 
-![Version: v0.1.0](https://img.shields.io/badge/Version-v0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square)
+![Version: v0.1.1](https://img.shields.io/badge/Version-v0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.1](https://img.shields.io/badge/AppVersion-v0.1.1-informational?style=flat-square)
 
 ## Using the Datadog Helm repository
 
diff --git a/charts/cloudprem/datadog.yaml b/charts/cloudprem/datadog.yaml
@@ -0,0 +1,114 @@
+version: 0.9
+index_id: datadog
+indexing_settings:
+  commit_timeout_secs: 30
+search_settings:
+  default_search_fields: []
+doc_mapping:
+  mode: dynamic
+  field_mappings:
+    - name: timestamp
+      type: datetime
+      fast: true
+      input_formats:
+        - rfc3339
+        - iso8601
+        - unix_timestamp
+    - name: discovery_timestamp
+      type: datetime
+      fast: false
+      indexed: false
+      input_formats:
+        - unix_timestamp
+        - rfc3339
+        - iso8601
+    - name: ingest_size_in_bytes
+      type: u64
+      fast: true
+      indexed: false
+      stored: false
+    - name: tiebreaker
+      type: i64
+      fast: true
+      indexed: false
+      stored: true
+    - name: message
+      type: text
+      tokenizer: default
+      record: position
+      fast: true
+    - name: id
+      type: text
+      tokenizer: raw
+    - name: custom
+      type: json
+      tokenizer: default
+      record: position
+      fast: true
+    - name: tag
+      type: json
+      tokenizer: default
+      fast: true
+    - name: tags
+      type: 'array<text>'
+      stored: true
+      indexed: false
+      fast: false
+    - name: error
+      type: json
+      tokenizer: default
+      record: position
+      fast: false
+      stored: false
+    - name: service
+      type: text
+      tokenizer: raw
+      fast: true
+    - name: source
+      type: text
+      tokenizer: raw
+      fast: true
+    - name: service_type
+      type: text
+      tokenizer: raw
+      fast: true
+    - name: status
+      type: text
+      tokenizer: raw
+      fast: true
+    - name: host
+      type: text
+      tokenizer: raw
+      fast: true
+    - name: trace_id
+      type: text
+      tokenizer: raw
+      fast: true
+    - name: span_id
+      type: text
+      tokenizer: raw
+    - name: default
+      type: concatenate
+      concatenate_fields:
+        - message
+        - error
+      tokenizer: default
+      record: position
+    - name: all
+      type: concatenate
+      concatenate_fields:
+        - message
+        - error
+        - source
+        - service
+        - service_type
+        - status
+        - host
+        - trace_id
+        - span_id
+        - custom
+      tokenizer: default
+      record: position
+  tag_fields: []
+  timestamp_field: timestamp
+  index_field_presence: true
diff --git a/charts/cloudprem/templates/configmap-bootstrap.yaml b/charts/cloudprem/templates/configmap-bootstrap.yaml
@@ -7,11 +7,13 @@ metadata:
     {{- include "quickwit.labels" . | nindent 4 }}
 data:
   {{- range .Values.seed.indexes }}
-  {{ .index_id }}.yaml: |-
-    {{- toYaml . | nindent 4 }}
+  {{- $config := $.Files.Get . | fromYaml }}
+  {{ . }}: |-
+    {{- toYaml $config | nindent 4 }}
   {{- end }}
   {{- range .Values.seed.sources }}
-  {{ .source.source_id }}.yaml: |-
-    {{- toYaml .source | nindent 4 }}
+  {{- $config := $.Files.Get . | fromYaml }}
+  {{ . }}: |-
+    {{- toYaml $config | nindent 4 }}
   {{- end }}
 {{- end }}
diff --git a/charts/cloudprem/templates/indexer-statefulset.yaml b/charts/cloudprem/templates/indexer-statefulset.yaml
@@ -151,4 +151,4 @@ spec:
         storageClassName: "{{ .Values.indexer.persistentVolume.storageClass }}"
       {{- end }}
   {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/cloudprem/templates/ingress/public-alb.yaml b/charts/cloudprem/templates/ingress/public-alb.yaml
@@ -2,7 +2,7 @@
 {{- $labels := include "quickwit.labels" . }}
 {{- $ingress := .Values.ingress.public }}
 
-{{- if $ingress.enabled -}}
+{{- if $ingress.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -15,6 +15,8 @@ metadata:
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/ssl-redirect: "443"
     alb.ingress.kubernetes.io/target-type: ip
+    alb.ingress.kubernetes.io/healthcheck-path: /grpc.health.v1.Health/Check
+    alb.ingress.kubernetes.io/success-codes: '0'
   {{- with  $ingress.extraAnnotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -34,7 +36,7 @@ spec:
                 name: {{ $fullname }}-searcher
                 port:
                   name: grpc
-        {{- with $ingress.host }}
+      {{- with $ingress.host }}
       host: {{ . }}
       {{- end }}
 {{- end }}
diff --git a/charts/cloudprem/templates/job-create-indices.yaml b/charts/cloudprem/templates/job-create-indices.yaml
@@ -1,10 +1,13 @@
 {{- if .Values.bootstrap.enabled -}}
 {{- range .Values.seed.indexes }}
+
+{{- $config := $.Files.Get . | fromYaml }}
+{{- $index_id := $config.index_id }}
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ printf "%s-index-%s" (include "quickwit.fullname" $ | trunc 47) .index_id | trunc 63 |  trimSuffix "-" }}
+  name: {{ printf "%s-index-%s" (include "quickwit.fullname" $ | trunc 47) $index_id | trunc 63 |  trimSuffix "-" }}
   labels:
     {{- include "quickwit.labels" $ | nindent 4 }}
   annotations:
@@ -41,7 +44,7 @@ spec:
         {{- if $.Values.bootstrap.indexes.command }}
         command: {{- toYaml $.Values.bootstrap.sources.command | nindent 8 }}
         {{- else }}
-        command: ["/bin/bash","-c","quickwit index describe --index {{ .index_id }} --endpoint ${QW_CLUSTER_ENDPOINT} || quickwit index create --index-config {{ .index_id }}.yaml --endpoint ${QW_CLUSTER_ENDPOINT}"]
+        command: ["/bin/bash","-c","quickwit index describe --index {{ $index_id }} --endpoint ${QW_CLUSTER_ENDPOINT} || quickwit index create --index-config {{ . }} --endpoint ${QW_CLUSTER_ENDPOINT}"]
         {{- end }}
         env:
           {{- include "quickwit.environment" $ | nindent 10 }}
@@ -63,8 +66,8 @@ spec:
             mountPath: /quickwit/node.yaml
             subPath: node.yaml
           - name: index
-            mountPath: /quickwit/{{ .index_id }}.yaml
-            subPath: {{ .index_id }}.yaml
+            mountPath: /quickwit/{{ . }}
+            subPath: {{ . }}
           {{- with $.Values.bootstrap.indexes.extraVolumeMounts }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
@@ -81,8 +84,8 @@ spec:
           configMap:
             name: {{ template "quickwit.fullname" $ }}-bootstrap
             items:
-              - key: {{ .index_id }}.yaml
-                path: {{ .index_id }}.yaml
+              - key: {{ . }}
+                path: {{ . }}
          {{- with $.Values.bootstrap.indexes.extraVolumes }}
            {{- toYaml . | nindent 8 }}
          {{- end }}
diff --git a/charts/cloudprem/values.yaml b/charts/cloudprem/values.yaml
@@ -8,7 +8,7 @@ image:
   # The CloudPrem image is also available on DockerHub:
   # https://hub.docker.com/r/datadog/cloudprem
   repository: public.ecr.aws/datadog/cloudprem
-  tag: v0.1.0
+  tag: v0.1.1
   pullPolicy: IfNotPresent
 
 imagePullSecrets: []
@@ -567,108 +567,7 @@ config:
 # Seed configuration
 seed:
   indexes:
-    - version: 0.9
-      index_id: datadog
-
-      indexing_settings:
-        commit_timeout_secs: 30
-      search_settings:
-        default_search_fields: []
-
-      doc_mapping:
-        mode: dynamic
-        tag_fields: []
-        timestamp_field: timestamp
-        index_field_presence: true
-
-        field_mappings:
-          - name: timestamp
-            type: datetime
-            fast: true
-            input_formats:
-              - rfc3339
-              - iso8601
-              - unix_timestamp
-
-          - name: message
-            type: text
-            record: position
-            fast: true
-
-          - name: id
-            type: text
-            tokenizer: raw
-
-          - name: custom
-            type: json
-            record: position
-            fast: true
-
-          - name: tag
-            type: json
-            tokenizer: raw
-            fast: true
-
-          - name: tags
-            type: 'array<text>'
-            stored: true
-            indexed: false
-            fast: false
-
-          - name: error
-            type: json
-            record: position
-            fast: true
-
-          - name: service
-            type: text
-            tokenizer: raw
-            fast: true
-
-          - name: service_type
-            type: text
-            tokenizer: raw
-            fast: true
-
-          - name: status
-            type: text
-            tokenizer: raw
-            fast: true
-
-          - name: host
-            type: text
-            tokenizer: raw
-            fast: true
-
-          - name: trace_id
-            type: text
-            tokenizer: raw
-            fast: true
-
-          - name: span_id
-            type: text
-            tokenizer: raw
-
-          - name: default
-            type: concatenate
-            concatenate_fields:
-              - error
-              - message
-            record: position
-
-          - name: all
-            type: concatenate
-            concatenate_fields:
-              - custom
-              - error
-              - host
-              - message
-              - service
-              - service_type
-              - span_id
-              - status
-              - trace_id
-            record: position
+    - datadog.yaml
 
   sources: []
     # - index: my-index
