Make chart testing more robust

Author: whatnick

.github/workflows/helm-chart-test.yml

@@ -160,40 +160,3 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: reports/results.sarif
-
-  chart-testing:
-    name: Chart Testing (ct)
-    runs-on: ubuntu-latest
-    needs: lint
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v3
-        with:
-          version: ${{ env.HELM_VERSION }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.x
-
-      - name: Set up chart-testing
-        uses: helm/[email protected]
-
-      - name: Setup Helm repositories
-        uses: ./.github/actions/setup-helm-repos
-        
-      - name: Run chart-testing (lint)
-        run: ct lint --config .github/ct.yaml
-
-      - name: Set up Kind cluster
-        uses: helm/[email protected]
-        with:
-          version: ${{ env.KIND_VERSION }}
-
-      - name: Run chart-testing (install)
-        run: ct install --config .github/ct.yaml

helm-chart/stac-fastapi/templates/NOTES.txt

@@ -78,7 +78,12 @@
    {{- if .Values.monitoring.prometheus.enabled }}
    - Prometheus metrics: /metrics
    {{- if .Values.monitoring.prometheus.serviceMonitor.enabled }}
-   - ServiceMonitor created for Prometheus Operator
+    {{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor" }}
+    - ServiceMonitor created for Prometheus Operator
+    {{- else }}
+    - ServiceMonitor requested but CRD monitoring.coreos.com/v1 not found
+       (install Prometheus Operator to enable it)
+    {{- end }}
    {{- end }}
    {{- end }}
 {{- end }}

helm-chart/stac-fastapi/templates/servicemonitor.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.monitoring.enabled .Values.monitoring.prometheus.enabled .Values.monitoring.prometheus.serviceMonitor.enabled }}
+{{- if and .Values.monitoring.enabled .Values.monitoring.prometheus.enabled .Values.monitoring.prometheus.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

helm-chart/stac-fastapi/values.yaml

@@ -234,7 +234,6 @@ elasticsearch:
     elasticsearch.yml: |
       cluster.name: "stac-elasticsearch"
       network.host: 0.0.0.0
-      discovery.type: single-node
       action.destructive_requires_name: false
       xpack.security.enabled: false
       xpack.security.transport.ssl.enabled: false