diff --git a/.github/workflows/chart-testing.yaml b/.github/workflows/chart-testing.yaml index a1eb7c5..1cab08e 100644 --- a/.github/workflows/chart-testing.yaml +++ b/.github/workflows/chart-testing.yaml @@ -62,4 +62,4 @@ jobs: with: version: 'latest' - name: Run chart-testing (install) - run: ct install --config chart-testing.yaml --helm-extra-set-args '--set=exporter.tls.enabled=false --set=auth0.domain=${{ secrets.TEST_AUTH0_DOMAIN }} --set=auth0.clientId=${{ secrets.TEST_AUTH0_CLIENT_ID }} --set=auth0.clientSecret=${{ secrets.TEST_AUTH0_CLIENT_SECRET }}' + run: ct install --config chart-testing.yaml --helm-extra-set-args '--set=exporter.tls.disabled=true --set=auth0.domain=${{ secrets.TEST_AUTH0_DOMAIN }} --set=auth0.clientId=${{ secrets.TEST_AUTH0_CLIENT_ID }} --set=auth0.clientSecret=${{ secrets.TEST_AUTH0_CLIENT_SECRET }}' diff --git a/deploy/charts/auth0-exporter/Chart.yaml b/deploy/charts/auth0-exporter/Chart.yaml index 109b649..7b8a0f5 100644 --- a/deploy/charts/auth0-exporter/Chart.yaml +++ b/deploy/charts/auth0-exporter/Chart.yaml @@ -15,13 +15,13 @@ 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: 0.2.6 +version: 0.3.0-rc.1 # 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. # It is recommended to use it with quotes. -appVersion: "0.2.6" +appVersion: "0.3.0-rc.1" home: https://github.com/tfadeyi/auth0-simple-exporter maintainers: diff --git a/deploy/charts/auth0-exporter/README.md b/deploy/charts/auth0-exporter/README.md index cee7eca..1b67b4e 100644 --- a/deploy/charts/auth0-exporter/README.md +++ b/deploy/charts/auth0-exporter/README.md @@ -39,10 +39,10 @@ on the `/metrics` endpoint. | auth0.clientSecret | string | `""` | Auth0 management api client-secret. (do not set if static token is already set) | | auth0.domain | string | `".eu.auth0.com"` | Auth0 tenant's domain. (i.e: .eu.auth0.com) | | auth0.token | string | `""` | Auth0 management api static token. (the token can be used instead of client credentials) | -| exporter | object | `{"logLevel":"info","metrics":{"users":{"disabled":false}},"metricsEndpoint":"metrics","namespace":"","port":9301,"pprof":false,"tls":{"auto":false,"certFile":"","createSecret":false,"disabled":false,"hosts":[],"keyFile":"","secretKey":"","secretName":""}}` | Exporter's configuration | -| exporter.metrics | object | `{"users":{"disabled":false}}` | Exporter's metrics configuration | -| exporter.metrics.users | object | `{"disabled":false}` | Tenant Users metrics exported by the exporter | -| exporter.metrics.users.disabled | bool | `false` | Stops the exporter from fetching user info from the Auth0 tenant | +| exporter | object | `{"logLevel":"info","metrics":{"users":{"enabled":false}},"metricsEndpoint":"metrics","namespace":"","port":9301,"pprof":false,"tls":{"auto":false,"certFile":"","createSecret":false,"disabled":false,"hosts":[],"keyFile":"","secretKey":"","secretName":""}}` | Exporter's configuration | +| exporter.metrics | object | `{"users":{"enabled":false}}` | Exporter's metrics configuration | +| exporter.metrics.users | object | `{"enabled":false}` | Tenant Users metrics exported by the exporter | +| exporter.metrics.users.enabled | bool | `false` | Stops the exporter from fetching user info from the Auth0 tenant | | exporter.metricsEndpoint | string | `"metrics"` | URL Path under which to expose the collected auth0 metrics. | | exporter.port | int | `9301` | Port where the server will listen. | | exporter.pprof | bool | `false` | Enabled pprof profiling on the exporter on port :6060. (help: https://jvns.ca/blog/2017/09/24/profiling-go-with-pprof/) | @@ -52,7 +52,7 @@ on the `/metrics` endpoint. | exporter.tls.disabled | bool | `false` | Run exporter without TLS. | | exporter.tls.keyFile | string | `""` | The key file for the exporter TLS connection. | | fullnameOverride | string | `""` | Helm default setting, use this to shorten install name | -| image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/tfadeyi/auth0-simple-exporter","tag":"v0.1.1"}` | image settings | +| image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/tfadeyi/auth0-simple-exporter","tag":"v0.2.6"}` | image settings | | imagePullSecrets | list | `[]` | specify credentials if pulling from a customer registry | | labels | object | `{}` | | | nameOverride | string | `""` | Helm default setting to override release name, leave blank | diff --git a/deploy/charts/auth0-exporter/templates/deployment.yaml b/deploy/charts/auth0-exporter/templates/deployment.yaml index d3d30a0..279e237 100644 --- a/deploy/charts/auth0-exporter/templates/deployment.yaml +++ b/deploy/charts/auth0-exporter/templates/deployment.yaml @@ -76,10 +76,10 @@ spec: - "--web.listen-address" - "{{- .Values.exporter.port }}" {{- end }} - {{- if .Values.exporter.metrics.users.disabled }} + {{- if (not .Values.exporter.metrics.users.enabled) }} - "--metrics.users.disabled" {{- end }} - {{- if (not .Values.exporter.tls.enabled) }} + {{- if .Values.exporter.tls.disabled }} - "--tls.disabled" {{- else if .Values.exporter.tls.auto }} - "--tls.auto" @@ -89,7 +89,7 @@ spec: - "--tls.cert-file=/etc/tls-certs/cert-file" - "--tls.key-file=/etc/tls-certs/key-file" {{- end }} - {{- if and .Values.exporter.tls.enabled (default .Values.exporter.tls.auto false) }} + {{- if and (default.Values.exporter.tls.disabled false) (default .Values.exporter.tls.auto false) }} volumeMounts: - name: tls-certs mountPath: "/etc/tls-certs/" @@ -109,7 +109,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - {{- if and .Values.exporter.tls.enabled (default .Values.exporter.tls.auto false) }} + {{- if and (default.Values.exporter.tls.disabled false) (default .Values.exporter.tls.auto false) }} volumes: - name: tls-certs secret: diff --git a/deploy/charts/auth0-exporter/values.yaml b/deploy/charts/auth0-exporter/values.yaml index 48e9686..28d2529 100644 --- a/deploy/charts/auth0-exporter/values.yaml +++ b/deploy/charts/auth0-exporter/values.yaml @@ -47,7 +47,7 @@ exporter: # -- Tenant Users metrics exported by the exporter users: # -- Stops the exporter from fetching user info from the Auth0 tenant - disabled: false + enabled: false # -- Exporter's TLS configuration tls: @@ -55,7 +55,7 @@ exporter: # (can only be used if the exporter is publicly accessible by the internet) auto: false # -- Run exporter without TLS. - enabled: true + disabled: false # -- The different allowed hosts for the exporter. Only works when --tls.auto has been enabled. hosts: [] createSecret: false