From 7f7f9313f8a089753a142c0b309b95af8d81cf86 Mon Sep 17 00:00:00 2001 From: Xstar97 Date: Sat, 29 Oct 2022 07:36:39 -0400 Subject: [PATCH] fix(speedtest-tracker) change upstream image (#4225) * fix(speedtest-tracker) change upstream image * docs + ranr * initial work for pgsql * remove secrets * set mirror image * revert back to ghcr * rar * prettier * repo Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/incubator/speedtest-tracker/Chart.yaml | 10 ++- .../speedtest-tracker/docs/credentials.md | 4 +- .../speedtest-tracker/questions.yaml | 61 +------------------ .../incubator/speedtest-tracker/values.yaml | 35 +++++++---- 4 files changed, 32 insertions(+), 78 deletions(-) diff --git a/charts/incubator/speedtest-tracker/Chart.yaml b/charts/incubator/speedtest-tracker/Chart.yaml index 722521e5595..2b31db0b894 100644 --- a/charts/incubator/speedtest-tracker/Chart.yaml +++ b/charts/incubator/speedtest-tracker/Chart.yaml @@ -4,7 +4,11 @@ dependencies: - name: common repository: https://library-charts.truecharts.org version: 10.7.7 -description: This app runs a speedtest check every hour and graphs the results. + - condition: postgresql.enabled + name: postgresql + repository: https://charts.truecharts.org/ + version: 8.0.48 +description: A self-hosted internet performance tracking application that runs speedtest checks against Ookla's Speedtest service. home: https://truecharts.org/docs/charts/incubator/speedtest-tracker icon: https://truecharts.org/img/hotlink-ok/chart-icons/speedtest-tracker.png keywords: @@ -17,8 +21,8 @@ maintainers: name: speedtest-tracker sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/speedtest-tracker - - https://github.com/henrywhitaker3/Speedtest-Tracker -version: 0.0.6 + - https://github.com/alexjustesen/speedtest-tracker +version: 0.1.0 annotations: truecharts.org/catagories: | - speedtest diff --git a/charts/incubator/speedtest-tracker/docs/credentials.md b/charts/incubator/speedtest-tracker/docs/credentials.md index 3c40ce62145..2569a2b8c4b 100644 --- a/charts/incubator/speedtest-tracker/docs/credentials.md +++ b/charts/incubator/speedtest-tracker/docs/credentials.md @@ -1,6 +1,4 @@ # Default Credentials -If you set `Enable Auth` to true, default credentials are: - -- Username: `admin@admin.com` +- Username: `admin@example.com` - Password: `password` diff --git a/charts/incubator/speedtest-tracker/questions.yaml b/charts/incubator/speedtest-tracker/questions.yaml index 10ccce095cc..2bd2b310644 100644 --- a/charts/incubator/speedtest-tracker/questions.yaml +++ b/charts/incubator/speedtest-tracker/questions.yaml @@ -12,63 +12,6 @@ questions: # Include{recreate} # Include{controllerExpert} # Include{controllerExpertExtraArgs} - - variable: secretEnv - group: Container Configuration - label: Image Secrets - schema: - additional_attrs: true - type: dict - attrs: - - variable: TELEGRAM_BOT_TOKEN - label: Telegram Bot Token - schema: - type: string - private: true - default: "" - - variable: TELEGRAM_CHAT_ID - label: Telegram Chat ID - schema: - type: string - private: true - default: "" - - variable: SLACK_WEBHOOK - label: Slack Webhook - description: Put a slack webhook here to get slack notifications when a speedtest is run. To use discord webhooks, just append /slack to the end of your discord webhook URL - schema: - type: string - private: true - default: "" - - variable: env - group: Container Configuration - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: OOKLA_EULA_GDPR - label: Accept OOKLA EULA and GDPR - description: Set to 'true' to accept the Ookla EULA and privacy agreement. If this is not set, the container will not start - schema: - type: boolean - default: false - - variable: AUTH - label: Enable Auth - description: When enabled, unauthenticated users will only be able to see the graphs and tests table. - schema: - type: boolean - default: false - - variable: INFLUXDB_RETENTION - label: InfluxDB Retention - description: Sets the InfluxDB retention period - schema: - type: string - default: 30d - - variable: INFLUXDB_HOST_TAG - label: InfluxDB Host Tag - description: Sets the InfluxDB host tag value - schema: - type: string - default: speedtest # Include{containerConfig} # Include{serviceRoot} - variable: main @@ -93,13 +36,13 @@ questions: type: int default: 8765 required: true -# Include{advancedPortHTTP} +# Include{advancedPortHTTPS} - variable: targetPort label: Target Port description: The internal(!) port on the container the Application runs on schema: type: int - default: 80 + default: 443 # Include{serviceExpertRoot} default: false # Include{serviceExpert} diff --git a/charts/incubator/speedtest-tracker/values.yaml b/charts/incubator/speedtest-tracker/values.yaml index f40b3cb2669..a2c94fedfb7 100644 --- a/charts/incubator/speedtest-tracker/values.yaml +++ b/charts/incubator/speedtest-tracker/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/speedtest-tracker - tag: latest@sha256:415ff67401643e0ac53146e3025f8970e629c34f872fdc433491d61198292f8d + tag: latest@sha256:20a1812252cbda90d9b7a06d32247c28477f2d73fd8295323a8117242dbc3a1a pullPolicy: IfNotPresent securityContext: @@ -11,29 +11,38 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secretEnv: - TELEGRAM_BOT_TOKEN: "" - TELEGRAM_CHAT_ID: "" - SLACK_WEBHOOK: "" - env: - OOKLA_EULA_GDPR: true - AUTH: false - INFLUXDB_RETENTION: 30d - INFLUXDB_HOST_TAG: speedtest + DB_CONNECTION: pgsql + DB_PORT: 5432 + DB_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}" + DB_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}" + DB_HOST: + secretKeyRef: + name: dbcreds + key: plainhost + DB_PASSWORD: + secretKeyRef: + name: dbcreds + key: postgresql-password service: main: ports: main: port: 8765 - protocol: HTTP - targetPort: 80 + protocol: HTTPS + targetPort: 443 persistence: config: enabled: true - mountPath: "/config" + mountPath: /config + +postgresql: + enabled: true + existingSecret: dbcreds + postgresqlDatabase: speedtest_tracker + postgresqlUsername: speedtest_tracker portal: enabled: true