Upgrade to pomerium 0.2.0 (pomerium#19)

- Bump default image version - Support new configuration options Signed-off-by: Travis Groth <[email protected]>
psychomelet · Aug 7, 2019 · 249c9da · 249c9da
1 parent 7b5096b
commit 249c9da
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: pomerium
-version: 1.2.2
-appVersion: 0.1.0
+version: 1.3.0
+appVersion: 0.2.0
 home: http://www.pomerium.io/
 icon: https://www.pomerium.io/logo.svg
 description: Pomerium is an identity-aware access proxy.

diff --git a/README.md b/README.md
@@ -78,6 +78,11 @@ Parameter                         | Description
 `serviceMonitor.enabled`          | Create Prometheus Operator ServiceMonitor                                            | `false`
 `serviceMonitor.namespace`        | Namespace to create the ServiceMonitor resource in                                   | The namespace of the chart
 `serviceMonitor.labels`           | Additional labels to apply to the ServiceMonitor resource                            | `release: prometheus`
+`tracing.enabled`                 | Enable distributed tracing                                                                                                                                                                                 | `false`
+`tracing.debug`                   | Set trace sampling to 100%.  Use with caution!                                                                                                                                                             | `false`
+`tracing.provider`                | Specifies the tracing provider to configure (Valid options: Jaeger)                                                                                                                                                               | Required
+`tracing.jaeger.collector_endpoint` | The jaeger collector endpoint                                                                                                                                                                            | Required
+`tracing.jaeger.agent_endpoint`     | The jaeger agent endpoint                                                                                                                                                                                | Required
 `ingress.enabled`                 | Enables Ingress for pomerium                                                                                                                                                                               | `false`
 `ingress.annotations`             | Ingress annotations                                                                                                                                                                                        | `{}`
 `ingress.hosts`                   | Ingress accepted hostnames                                                                                                                                                                                 | `nil`

diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -21,6 +21,16 @@ data:
 {{- end -}}
 {{- if .Values.metrics.enabled }}
     metrics_address: :{{ .Values.metrics.port }}
+{{- end -}}
+{{- if .Values.tracing.enabled }}
+    tracing_debug: {{ .Values.tracing.debug }}
+    tracing_provider: {{ required "tracing_provider is required for tracing" .Values.tracing.provider }}
+
+{{- if eq .Values.tracing.provider "jaeger" }}
+    tracing_jaeger_collector_endpoint: {{ required "collector_endpoint is required for jaeoger tracing" .Values.tracing.jaeger.collector_endpoint }}
+    tracing_jaeger_agent_endpoint: {{ required "agent_endpoint is required for jaeger tracing" .Values.tracing.jaeger.agent_endpoint }}
+{{- end -}}
+
 {{- end -}}
 {{- if .Values.config.policy }}
     policy: 

diff --git a/values.yaml b/values.yaml
@@ -115,13 +115,21 @@ extraVolumes: {}
 
 image:
   repository: "pomerium/pomerium"
-  tag: "v0.1.0"
+  tag: "v0.2.0"
   pullPolicy: "IfNotPresent"
 
 metrics:
   enabled: false
   port: 9090
 
+tracing:
+  enabled: false
+  provider: ""
+  debug: false
+  jaeger:
+    collector_endpoint: ""
+    agent_endpoint: ""
+
 serviceMonitor:
   enabled: false
   namespace: ""