Expose tempo.storage.traces.s3.credentialMode (#63)

This is so we can use AWS STS for S3

Author: christian-stephen

Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: server-monitoring-stack
 description: A reference Helm chart for setting up a monitoring stack for CircleCI server
-version: 0.1.0-alpha.5
+version: 0.1.0-alpha.6
 dependencies:
   - name: prometheus-operator-crds
     version: 19.0.0

README.md

@@ -16,7 +16,7 @@ This repository is currently under active development and is not yet a supported
 
 A reference Helm chart for setting up a monitoring stack for CircleCI server
 
-![Version: 0.1.0-alpha.5](https://img.shields.io/badge/Version-0.1.0--alpha.5-informational?style=flat-square)
+![Version: 0.1.0-alpha.6](https://img.shields.io/badge/Version-0.1.0--alpha.6-informational?style=flat-square)
 
 ## Installing the Monitoring Stack
 
@@ -58,7 +58,7 @@ Before installing the full chart, you must first install the dependency subchart
 Install the Prometheus Custom Resource Definitions (CRDs) and the Grafana operator chart. This assumes you are installing it in the same namespace as your CircleCI server installation:
 
 ```bash
-$ helm install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --set global.enabled=false --set prometheusOperator.installCRDs=true --version 0.1.0-alpha.5 -n <your-server-namespace>
+$ helm install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --set global.enabled=false --set prometheusOperator.installCRDs=true --version 0.1.0-alpha.6 -n <your-server-namespace>
 ```
 
 > **_NOTE:_** It's possible to install the monitoring stack in a different namespace than the CircleCI server installation. If you do so, set the `prometheus.serviceMonitor.selectorNamespaces` value with the target namespace.
@@ -95,7 +95,7 @@ $ kubectl wait --for=condition=available --timeout=120s deployment/tempo-operato
 Next, install the Helm chart using the following command:
 
 ```bash
-$ helm upgrade --install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --reset-values --version 0.1.0-alpha.5 -n <your-server-namespace>
+$ helm upgrade --install server-monitoring-stack server-monitoring-stack/server-monitoring-stack --reset-values --version 0.1.0-alpha.6 -n <your-server-namespace>
 ```
 
 ### 5. Verify Prometheus Is Up and Targeting Telegraf

templates/tempo/tempomonolithic.yaml

@@ -23,6 +23,7 @@ spec:
 
       {{- if eq .backend "s3" }}
       s3:
+        credentialMode: {{ .s3.credentialMode }}
         secret: {{ .s3.secret }}
       {{- end }}
 

tests/tempo/tempomonolithic_test.yaml

@@ -49,12 +49,16 @@ tests:
     set:
       tempo.enabled: true
       tempo.storage.traces.backend: s3
+      tempo.storage.traces.s3.credentialMode: token-cco
       tempo.storage.traces.s3.secret: my-s3-secret
       tempo.storage.traces.size: 100Gi
     asserts:
       - equal:
           path: spec.storage.traces.backend
           value: s3
+      - equal:
+          path: spec.storage.traces.s3.credentialMode
+          value: token-cco
       - equal:
           path: spec.storage.traces.s3.secret
           value: my-s3-secret

values.yaml

@@ -180,10 +180,13 @@ tempo:
       # Choose based on your CircleCI server deployment location:
 
       # -- AWS S3 (use if CircleCI server is on AWS)
+      # backend: s3
       # s3:
+      #   credentialMode: "<static|token|token-cco>"
       #   secret: tempo-s3-secret
 
       # -- Google Cloud Storage (use if CircleCI server is on GCP)
+      # backend: gcs
       # gcs:
       #   secret: tempo-gcs-secret