Fix _helpers.tpl

.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.2.2
+
+      - name: Install Helm
+        uses: azure/setup-helm@v4.3.0
+
+      - name: Lint chart
+        run: helm lint . --set collector.env.COLLECTOR_SECRET=test123
+
+      - name: Test template with COLLECTOR_SECRET
+        run: helm template test . --set collector.env.COLLECTOR_SECRET=test123
+
+      - name: Test template with envFrom
+        run: helm template test . --set-json 'collector.envFrom=[{"secretRef":{"name":"my-secret"}}]'
+
+      - name: Test validation fails without secret
+        run: |
+          if helm template test . 2>&1; then
+            echo "Expected validation to fail but it passed"
+            exit 1
+          fi

Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: collector
 description: A Helm chart for Better Stack Collector - monitoring solution that collects metrics, logs, and traces
 type: application
-version: 0.1.32
+version: 0.1.33
 appVersion: "latest"
 keywords:
   - monitoring

templates/_helpers.tpl

@@ -66,7 +66,7 @@ Create the name of the service account to use
 Validate required values
 */}}
 {{- define "better-stack-collector.validateValues" -}}
-{{- if not (or .Values.collector.env.COLLECTOR_SECRET (gt (len .Values.collector.envFrom.secretRefs) 0)) }}
-{{- fail "COLLECTOR_SECRET is required. Please provide your Better Stack collector secret either via collector.env.COLLECTOR_SECRET or through collector.envFrom.secretRefs. Find your collector secret here: https://telemetry.betterstack.com/team/0/collectors." }}
+{{- if not (or .Values.collector.env.COLLECTOR_SECRET (gt (len .Values.collector.envFrom) 0)) }}
+{{- fail "COLLECTOR_SECRET is required. Please provide your Better Stack collector secret either via collector.env.COLLECTOR_SECRET or through collector.envFrom (standard Kubernetes envFrom format). Find your collector secret here: https://telemetry.betterstack.com/team/0/collectors." }}
 {{- end }}
 {{- end }}

values.yaml

@@ -11,7 +11,7 @@ collector:
 
   # Environment variables
   env:
-    COLLECTOR_SECRET: ""  # Required: Your collector secret (leave empty if you set it via envFrom.secretRefs)
+    COLLECTOR_SECRET: ""  # Required: Your collector secret (leave empty if using envFrom)
     BASE_URL: "https://telemetry.betterstack.com"
     CLUSTER_COLLECTOR: ""
     VECTOR_LOG_FORMAT: "json"