fix(chart): Revert previous changes to the helm chart

Brings back the tls.disabled value to the chart.
Updates the exporter.metrics.users.disabled to enable.

Signed-off-by: oluwole fadeyi <[email protected]>

.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 }}'

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 | `"<change_me>.eu.auth0.com"` | Auth0 tenant's domain. (i.e: <tenant_name>.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 |

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:

deploy/charts/auth0-exporter/values.yaml

@@ -47,15 +47,15 @@ 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:
     # -- Allow the exporter to use autocert to renew its certificates with letsencrypt.
     # (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