Merge branch 'main' into dan/more-otel-collector-testing

Author: dhable

.changeset/better-otters-train.md

@@ -37,6 +37,11 @@ jobs:
           helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
           helm dependency build charts/clickstack
 
+      - name: Validate ALB example values render
+        run: |
+          helm template clickstack-example charts/clickstack \
+            -f examples/alb-ingress/values.yaml >/dev/null
+
       - name: Run helm-unittest
         run: |
           helm unittest charts/clickstack

.github/workflows/helm-test.yaml

@@ -1,5 +1,15 @@
 # helm-charts
 
+## 2.1.0
+
+### Minor Changes
+
+- a615199: Add `additionalManifests` value for deploying arbitrary Kubernetes objects (NetworkPolicy, HPA, ServiceAccount, PodMonitor, ALB Ingress, etc.) alongside the chart. See docs/ADDITIONAL-MANIFESTS.md for usage and examples.
+
+### Patch Changes
+
+- 6f29e73: fix: combine ClickHouse app user grants into single query
+
 ## 2.0.0
 
 ### Major Changes

CHANGELOG.md

@@ -21,6 +21,10 @@ For configuration, cloud deployment, ingress setup, and troubleshooting, see the
 - **`clickstack/clickstack-operators`** - Installs the MongoDB and ClickHouse operator controllers and CRDs. Must be installed first.
 - **`clickstack/clickstack`** - Installs HyperDX, OpenTelemetry Collector, and operator custom resources.
 
+## Additional Manifests
+
+The `clickstack` chart supports deploying arbitrary Kubernetes objects (NetworkPolicy, HPA, ServiceAccount, PodMonitor, ALB Ingress, etc.) alongside the chart's own resources via the `additionalManifests` value. See the [Additional Manifests Guide](docs/ADDITIONAL-MANIFESTS.md) for values-file constraints and examples, including [AWS ALB example values](examples/alb-ingress/values.yaml).
+
 ## Operator Dependencies
 
 The `clickstack-operators` chart bundles:

README.md

@@ -15,7 +15,7 @@ annotations:
     - name: Upstream Project
       url: https://github.com/hyperdxio/hyperdx
 type: application
-version: 2.0.0
+version: 2.1.0
 appVersion: 2.22.0
 dependencies:
   - name: opentelemetry-collector

charts/clickstack/Chart.yaml

@@ -0,0 +1,4 @@
+{{- range .Values.additionalManifests }}
+---
+{{ tpl (toYaml .) $ }}
+{{- end }}

charts/clickstack/templates/additional-manifests.yaml

@@ -0,0 +1,119 @@
+suite: Test Additional Manifests
+templates:
+  - additional-manifests.yaml
+tests:
+  - it: should render nothing when additionalManifests is empty
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: should render a single manifest
+    set:
+      additionalManifests:
+        - apiVersion: v1
+          kind: ConfigMap
+          metadata:
+            name: my-extra-config
+          data:
+            key: value
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: metadata.name
+          value: my-extra-config
+      - equal:
+          path: data.key
+          value: value
+
+  - it: should render multiple manifests
+    set:
+      additionalManifests:
+        - apiVersion: v1
+          kind: ServiceAccount
+          metadata:
+            name: my-service-account
+        - apiVersion: networking.k8s.io/v1
+          kind: NetworkPolicy
+          metadata:
+            name: my-network-policy
+          spec:
+            podSelector:
+              matchLabels:
+                app: test
+    asserts:
+      - hasDocuments:
+          count: 2
+      - isKind:
+          of: ServiceAccount
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: my-service-account
+        documentIndex: 0
+      - isKind:
+          of: NetworkPolicy
+        documentIndex: 1
+      - equal:
+          path: metadata.name
+          value: my-network-policy
+        documentIndex: 1
+
+  - it: should evaluate tpl expressions in manifest values
+    set:
+      additionalManifests:
+        - apiVersion: v1
+          kind: ServiceAccount
+          metadata:
+            name: '{{ include "clickstack.fullname" . }}-sa'
+    asserts:
+      - hasDocuments:
+          count: 1
+      - matchRegex:
+          path: metadata.name
+          pattern: -clickstack-sa$
+
+  - it: should render an ALB Ingress with controller-specific annotations
+    set:
+      additionalManifests:
+        - apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: my-alb-ingress
+            annotations:
+              alb.ingress.kubernetes.io/scheme: internet-facing
+              alb.ingress.kubernetes.io/target-type: ip
+              alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:us-east-1:123456789:certificate/abc-123"
+              alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
+          spec:
+            ingressClassName: alb
+            rules:
+              - host: clickstack.example.com
+                http:
+                  paths:
+                    - path: /
+                      pathType: Prefix
+                      backend:
+                        service:
+                          name: my-app
+                          port:
+                            number: 3000
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Ingress
+      - equal:
+          path: spec.ingressClassName
+          value: alb
+      - equal:
+          path: metadata.annotations["alb.ingress.kubernetes.io/scheme"]
+          value: internet-facing
+      - equal:
+          path: metadata.annotations["alb.ingress.kubernetes.io/target-type"]
+          value: ip
+      - equal:
+          path: metadata.annotations["alb.ingress.kubernetes.io/certificate-arn"]
+          value: "arn:aws:acm:us-east-1:123456789:certificate/abc-123"

charts/clickstack/tests/additional-manifests_test.yaml

@@ -316,6 +316,13 @@ clickhouse:
           keep_alive_timeout: 64
           max_concurrent_queries: 100
 
+# Additional Kubernetes manifests to deploy alongside the chart.
+# Each entry is a complete Kubernetes object. Values are rendered through
+# Helm's tpl function so template expressions (Release.Name, include, .Values)
+# are available inside string fields.
+# See docs/ADDITIONAL-MANIFESTS.md for full examples.
+additionalManifests: []
+
 # OpenTelemetry Collector subchart configuration (alias: otel-collector)
 # See https://github.com/open-telemetry/opentelemetry-helm-charts for all options
 # Set otel-collector.enabled to false to disable the OTEL collector entirely.