From 09d9e14a73d28a2fb9f1be5f6091577a2d586f1d Mon Sep 17 00:00:00 2001 From: Travis Groth Date: Mon, 21 Mar 2022 08:37:57 -0400 Subject: [PATCH] [pomerium-console] update to v0.17 (#273) --- charts/pomerium-console/Chart.yaml | 4 ++-- charts/pomerium-console/README.md | 8 +++++--- charts/pomerium-console/README.md.gotmpl | 3 ++- charts/pomerium-console/templates/_helpers.tpl | 1 + charts/pomerium-console/values.yaml | 2 ++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/charts/pomerium-console/Chart.yaml b/charts/pomerium-console/Chart.yaml index f2663028..57b5e895 100644 --- a/charts/pomerium-console/Chart.yaml +++ b/charts/pomerium-console/Chart.yaml @@ -15,12 +15,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 7.1.0 +version: 8.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.16.0 +appVersion: 0.17.0 maintainers: - name: Pomerium Developers diff --git a/charts/pomerium-console/README.md b/charts/pomerium-console/README.md index 73529a74..077371db 100644 --- a/charts/pomerium-console/README.md +++ b/charts/pomerium-console/README.md @@ -1,6 +1,6 @@ # pomerium-console -![Version: 7.1.0](https://img.shields.io/badge/Version-7.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.16.0](https://img.shields.io/badge/AppVersion-0.16.0-informational?style=flat-square) +![Version: 8.0.0](https://img.shields.io/badge/Version-8.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.17.0](https://img.shields.io/badge/AppVersion-0.17.0-informational?style=flat-square) Pomerium Enterprise Console @@ -27,7 +27,8 @@ helm install pomerium-enterprise/pomerium-console \ --set config.sharedSecret=ZGVhZGJlZWZkZWFkYmVlZmRlYWRiZWVmCg== \ --set config.databaseEncryptionKey=hDiBsQ6MJFr2y9jhT6c2Uu3lHw9/IpULfBJyesjPWpE= \ --set config.authenticateServiceUrl=https://authenticate.localhost.pomerium.io \ - --set config.audience=console.localhost.pomerium.io + --set config.audience=console.localhost.pomerium.io \ + --set config.licenseKey=XXXXXXXXXXXXXXXXX ``` ## Values @@ -44,7 +45,8 @@ helm install pomerium-enterprise/pomerium-console \ | config.authenticateServiceUrl | string | `""` | **Required** for device identity enrollment. If set, you do not need to set signingKey. | | config.customerId | string | `""` | Override default customerId | | config.databaseEncryptionKey | string | `""` | **Required** encryption key for protecting sensitive data in the database | -| config.databrokerServiceUrl | string | `https://pomerium-databroker.[release namespace].svc.cluster.local` | Override the URL default to the Pomerium Databroker service | +| config.databrokerServiceUrl | string | `https://pomerium-databroker.[release namespace].svc.cluster.local` | Override the URL default to the Pomerium Cache service | +| config.licenseKey | string | `""` | **Required** license key for your Pomerium Enterprise install. | | config.prometheusUrl | string | `""` | Set URL for external prometheus server. An embedded server is used if left unset. | | config.sharedSecret | string | `""` | **Required** Secures communication with the databroker. Must match Pomerium `shared_secret` parameter. | | config.signingKey | string | `""` | **Required** if `config.authenticateServiceUrl` is unset. Set the public key for verifying the Pomerium attestation JWT header | diff --git a/charts/pomerium-console/README.md.gotmpl b/charts/pomerium-console/README.md.gotmpl index fb7e6434..569df408 100644 --- a/charts/pomerium-console/README.md.gotmpl +++ b/charts/pomerium-console/README.md.gotmpl @@ -28,7 +28,8 @@ helm install pomerium-enterprise/pomerium-console \ --set config.sharedSecret=ZGVhZGJlZWZkZWFkYmVlZmRlYWRiZWVmCg== \ --set config.databaseEncryptionKey=hDiBsQ6MJFr2y9jhT6c2Uu3lHw9/IpULfBJyesjPWpE= \ --set config.authenticateServiceUrl=https://authenticate.localhost.pomerium.io \ - --set config.audience=console.localhost.pomerium.io + --set config.audience=console.localhost.pomerium.io \ + --set config.licenseKey=XXXXXXXXXXXXXXXXX ``` {{ template "chart.valuesSection" . }} diff --git a/charts/pomerium-console/templates/_helpers.tpl b/charts/pomerium-console/templates/_helpers.tpl index ed3b7cdf..2460c8a3 100644 --- a/charts/pomerium-console/templates/_helpers.tpl +++ b/charts/pomerium-console/templates/_helpers.tpl @@ -14,6 +14,7 @@ Expand the name of the chart. {{- required "config.sharedSecret must be set" .Values.config.sharedSecret }} {{- required "config.databaseEncryptionKey must be set" .Values.config.databaseEncryptionKey }} {{- required "config.audience must be set" .Values.config.audience }} +{{- required "config.licenseKey" .Values.config.licenseKey -}} {{ if not (or .Values.config.signingKey .Values.config.authenticateServiceUrl)}} {{ fail "config.signingKey or config.authenticateServiceUrl must be set" }} {{- end }} diff --git a/charts/pomerium-console/values.yaml b/charts/pomerium-console/values.yaml index e392904d..7eb4e6d1 100644 --- a/charts/pomerium-console/values.yaml +++ b/charts/pomerium-console/values.yaml @@ -188,6 +188,8 @@ config: audience: "" # -- **Required** for device identity enrollment. If set, you do not need to set signingKey. authenticateServiceUrl: "" + # -- **Required** license key for your Pomerium Enterprise install. + licenseKey: "" prometheus: # -- Enable using an embedded prometheus service if no external URL is provided enabled: true